mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
b3ac6d2456
When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output.
69 lines
1.2 KiB
Plaintext
69 lines
1.2 KiB
Plaintext
adding .hgignore
|
|
adding a
|
|
adding eol.diff to series file
|
|
% should fail in strict mode
|
|
applying eol.diff
|
|
patching file a
|
|
Hunk #1 FAILED at 0
|
|
1 out of 1 hunks FAILED -- saving rejects to file a.rej
|
|
patch failed, unable to continue (try -v)
|
|
patch failed, rejects left in working dir
|
|
errors during apply, please fix and refresh eol.diff
|
|
popping eol.diff
|
|
patch queue now empty
|
|
% invalid eol
|
|
applying eol.diff
|
|
patch failed, unable to continue (try -v)
|
|
patch failed, rejects left in working dir
|
|
errors during apply, please fix and refresh eol.diff
|
|
popping eol.diff
|
|
patch queue now empty
|
|
% force LF
|
|
applying eol.diff
|
|
now at: eol.diff
|
|
test message<LF>
|
|
<LF>
|
|
diff --git a/a b/a<LF>
|
|
--- a/a<LF>
|
|
+++ b/a<LF>
|
|
@@ -1,5 +1,5 @@<LF>
|
|
-a<LF>
|
|
-b<LF>
|
|
-c<LF>
|
|
-d<LF>
|
|
-e<LF>
|
|
\ No newline at end of file<LF>
|
|
+a<CR><LF>
|
|
+y<CR><LF>
|
|
+c<CR><LF>
|
|
+d<CR><LF>
|
|
+z<LF>
|
|
\ No newline at end of file<LF>
|
|
a<CR><LF>
|
|
y<CR><LF>
|
|
c<CR><LF>
|
|
d<CR><LF>
|
|
z
|
|
popping eol.diff
|
|
patch queue now empty
|
|
% push again forcing LF and compare revisions
|
|
applying eol.diff
|
|
now at: eol.diff
|
|
a<CR><LF>
|
|
y<CR><LF>
|
|
c<CR><LF>
|
|
d<CR><LF>
|
|
z
|
|
popping eol.diff
|
|
patch queue now empty
|
|
% push again without LF and compare revisions
|
|
applying eol.diff
|
|
now at: eol.diff
|
|
a<CR><LF>
|
|
y<CR><LF>
|
|
c<CR><LF>
|
|
d<CR><LF>
|
|
z
|
|
popping eol.diff
|
|
patch queue now empty
|