Mercurial > hg
view tests/test-copy2 @ 7177:09ed32b79656
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.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 19 Oct 2008 16:31:24 +0200 |
parents | 44e17f5029d0 |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo echo "# should fail - foo is not managed" hg mv foo bar hg st -A hg add foo echo "# dry-run; print a warning that this is not a real copy; foo is added" hg mv --dry-run foo bar hg st -A echo "# should print a warning that this is not a real copy; bar is added" hg mv foo bar hg st -A echo "# should print a warning that this is not a real copy; foo is added" hg cp bar foo hg rm -f bar rm bar hg st -A hg commit -m1 -d"0 0" echo "# dry-run; should show that foo is clean" hg copy --dry-run foo bar hg st -A echo "# should show copy" hg copy foo bar hg st -C echo "# shouldn't show copy" hg commit -m2 -d"0 0" hg st -C echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 -d"0 0" echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg st -C hg commit -m3 -d"0 0" echo "# should show no parents for tip" hg debugindex .hg/store/data/bar.i echo "# should match" hg debugindex .hg/store/data/foo.i hg debugrename bar echo "# should show no copies" hg st -C echo "# copy --after on an added file" cp bar baz hg add baz hg cp -A bar baz hg st -C echo "# foo was clean:" hg st -AC foo echo "# but it's considered modified after a copy --after --force" hg copy -Af bar foo hg st -AC foo exit 0