##// END OF EJS Templates
fetch: do not count inactive branches when inferring a merge...
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

File last commit:

r7627:fb32ae9c default
r7854:423b4482 default
Show More
test-mq-missingfiles.out
54 lines | 1009 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
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 % 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
Martin Geisler
mq: lowercase output...
r7627 errors during apply, please fix and refresh changeb
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
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,3 +1,5 @@
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 +b
+b
a
a
a
Matt Mackall
diff: don't show function name by default...
r5863 @@ -8,3 +10,5 @@
Patrick Mezard
patch: write rej files for missing targets (issue 853)
r5652 a
a
a
+c
+c
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 adding b
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Patrick Mezard
mq: missing target files do not make qpush to fail immediately (issue 835)...
r5581 % 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
Martin Geisler
i18n: avoid naive plural tricks
r6952 1 out of 1 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)
b: No such file or directory
b not tracked!
patch failed, rejects left in working dir
Martin Geisler
mq: lowercase output...
r7627 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
Patrick Mezard
test-mq-missing: add test for directory creation on git copy
r7506 % test push creating directory during git copy or rename
adding a
Martin Geisler
mq: lowercase output...
r7627 patch queue now empty
Patrick Mezard
test-mq-missing: add test for directory creation on git copy
r7506 applying patch
Martin Geisler
mq: lowercase output...
r7627 now at: patch