##// 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.
Patrick Mezard - - Load All Authors

File last commit:

r5346:8838fe5a default
r7177:09ed32b7 default
Show More
test-debugindexdot
17 lines | 303 B | text/plain | TextLexer
/ tests / test-debugindexdot
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# Just exercize debugindexdot
# Create a short file history including a merge.
hg init t
cd t
echo a > a
hg ci -qAm t1 -d '0 0'
echo a >> a
hg ci -m t2 -d '1 0'
hg up -qC 0
echo b >> a
hg ci -m t3 -d '2 0'
HGMERGE=true hg merge -q
hg ci -m merge -d '3 0'
hg debugindexdot .hg/store/data/a.i