##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r6489:204a2ca2 default
r7177:09ed32b7 default
Show More
test-diff-copy-depth
31 lines | 398 B | text/plain | TextLexer
/ tests / test-diff-copy-depth
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
for i in aaa zzz; do
hg init t
cd t
echo "-- With $i"
touch file
hg add file
hg ci -m "Add"
hg cp file $i
hg ci -m "a -> $i"
hg cp $i other-file
echo "different" >> $i
hg ci -m "$i -> other-file"
hg cp other-file somename
echo "Status":
hg st -C
echo
echo "Diff:"
hg diff -g
echo
cd ..
rm -rf t
done