##// 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.
Benoit Boissinot - - Load All Authors

File last commit:

r7058:9e6d6568 default
r7177:09ed32b7 default
Show More
test-convert-bzr-treeroot
26 lines | 532 B | text/plain | TextLexer
/ tests / test-convert-bzr-treeroot
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
. "$TESTDIR/bzr-definitions"
cat > treeset.py <<EOF
import sys
from bzrlib import workingtree
wt = workingtree.WorkingTree.open('.')
message, rootid = sys.argv[1:]
wt.set_root_id('tree_root-%s' % rootid)
wt.commit(message)
EOF
echo % change the id of the tree root
mkdir test-change-treeroot-id
cd test-change-treeroot-id
bzr init -q source
cd source
echo content > file
bzr add -q file
bzr commit -q -m 'Initial add'
python ../../treeset.py 'Changed root' new
cd ..
hg convert source source-hg
manifest source-hg tip