##// END OF EJS Templates
Merge with crew
Merge with crew

File last commit:

r5652:e90e72c6 default
r5676:9ed65758 merge default
Show More
test-mq-missingfiles.out
49 lines | 895 B | text/plain | TextLexer
/ tests / test-mq-missingfiles.out
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 adding b
Patch queue now empty
% push patch with missing target
applying changeb
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 unable to find 'b' for patching
2 out of 2 hunks FAILED -- saving rejects to file b.rej
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 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
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 % display rejections
--- b
+++ b
@@ -1,3 +1,5 @@ a
+b
+b
a
a
a
@@ -8,3 +10,5 @@ a
a
a
a
+c
+c
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 adding b
Patch queue now empty
% push git patch with missing target
applying changeb
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 unable to find 'b' for patching
1 out of 1 hunk FAILED -- saving rejects to file b.rej
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 patch failed, unable to continue (try -v)
b: No such file or directory
b not tracked!
patch failed, rejects left in working dir
Errors during apply, please fix and refresh changeb
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 ? b.rej
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 % display added files
a
c
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 % display rejections
--- b
+++ b
GIT binary patch
literal 2
Jc${No0000400IC2