##// 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:

r5210:90d9ec0d default
r7177:09ed32b7 default
Show More
test-issue522
31 lines | 677 B | text/plain | TextLexer
#!/bin/sh
# In the merge below, the file "foo" has the same contents in both
# parents, but if we look at the file-level history, we'll notice that
# the version in p1 is an ancestor of the version in p2. This test
# makes sure that we'll use the version from p2 in the manifest of the
# merge revision.
hg init repo
cd repo
echo foo > foo
hg ci -d '0 0' -qAm 'add foo'
echo bar >> foo
hg ci -d '0 0' -m 'change foo'
hg backout -d '0 0' -r tip -m 'backout changed foo'
hg up -C 0
touch bar
hg ci -d '0 0' -qAm 'add bar'
hg merge --debug
hg debugstate | grep foo
hg st -A foo
hg ci -d '0 0' -m 'merge'
hg manifest --debug | grep foo
hg debugindex .hg/store/data/foo.i