mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +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.
57 lines
1.0 KiB
Plaintext
57 lines
1.0 KiB
Plaintext
adding b
|
|
popping changeb
|
|
patch queue now empty
|
|
% push patch with missing target
|
|
applying changeb
|
|
unable to find 'b' for patching
|
|
2 out of 2 hunks FAILED -- saving rejects to file b.rej
|
|
patch failed, unable to continue (try -v)
|
|
patch failed, rejects left in working dir
|
|
errors during apply, please fix and refresh changeb
|
|
% display added files
|
|
a
|
|
c
|
|
% display rejections
|
|
--- b
|
|
+++ b
|
|
@@ -1,3 +1,5 @@
|
|
+b
|
|
+b
|
|
a
|
|
a
|
|
a
|
|
@@ -8,3 +10,5 @@
|
|
a
|
|
a
|
|
a
|
|
+c
|
|
+c
|
|
adding b
|
|
popping changeb
|
|
patch queue now empty
|
|
% push git patch with missing target
|
|
applying changeb
|
|
unable to find 'b' for patching
|
|
1 out of 1 hunks FAILED -- saving rejects to file b.rej
|
|
patch failed, unable to continue (try -v)
|
|
b: No such file or directory
|
|
patch failed, rejects left in working dir
|
|
errors during apply, please fix and refresh changeb
|
|
? b.rej
|
|
% display added files
|
|
a
|
|
c
|
|
% display rejections
|
|
--- b
|
|
+++ b
|
|
GIT binary patch
|
|
literal 2
|
|
Jc${No0000400IC2
|
|
|
|
% test push creating directory during git copy or rename
|
|
adding a
|
|
popping patch
|
|
patch queue now empty
|
|
applying patch
|
|
now at: patch
|