##// END OF EJS Templates
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.

File last commit:

r6906:808f03f6 default
r7177:09ed32b7 default
Show More
test-rebase-mq-skip.out
24 lines | 527 B | text/plain | TextLexer
/ tests / test-rebase-mq-skip.out
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch
% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
nothing changed
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@ 3 P0 tags: p0.patch qtip tip qbase
|
o 2 P1 tags: qparent
|
o 1 R1 tags:
|
o 0 C1 tags: