##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: Fix --qrefresh --short to work with --exclude and --include...
mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.
Martin Geisler - - Load All Authors

File last commit:

r6952:3fffba1c default
r7177:09ed32b7 default
Show More
test-mq-missingfiles.out
49 lines | 892 B | text/plain | TextLexer
/ tests / test-mq-missingfiles.out
History | Source | Raw |Copy content |Copy permalink
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
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
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
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
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