Mercurial > hg
view tests/test-parents @ 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 | 5a4824f6665c |
children |
line wrap: on
line source
#!/bin/sh # test parents command hg init repo cd repo echo % no working directory hg parents echo a > a echo b > b hg ci -Amab -d '0 0' echo a >> a hg ci -Ama -d '1 0' echo b >> b hg ci -Amb -d '2 0' echo c > c hg ci -Amc -d '3 0' hg up -C 1 echo d > c hg ci -Amc2 -d '4 0' hg up -C 3 echo % hg parents hg parents echo % hg parents a hg parents a echo % hg parents c, single revision hg parents c echo % hg parents -r 3 c hg parents -r 3 c echo % hg parents -r 2 hg parents -r 2 echo % hg parents -r 2 a hg parents -r 2 a echo % hg parents -r 2 ../a hg parents -r 2 ../a echo '% cd dir; hg parents -r 2 ../a' mkdir dir cd dir hg parents -r 2 ../a echo '% hg parents -r 2 path:a' hg parents -r 2 path:a echo '% hg parents -r 2 glob:a' cd .. hg parents -r 2 glob:a echo % merge working dir with 2 parents, hg parents c HGMERGE=true hg merge hg parents c echo % merge working dir with 1 parent, hg parents hg up -C 2 HGMERGE=true hg merge -r 4 hg parents echo % merge working dir with 1 parent, hg parents c hg parents c true