Mercurial > hg
annotate tests/test-symlink-addremove @ 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 | 7f0dd352fb4d |
children |
rev | line source |
---|---|
6651
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
1 #!/bin/sh |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
2 |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
3 "$TESTDIR/hghave" symlink || exit 80 |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
4 |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
5 hg init a |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
6 cd a |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
7 |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
8 echo '% directory moved and symlinked' |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
9 mkdir foo |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
10 touch foo/a |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
11 hg ci -Ama |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
12 mv foo bar |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
13 ln -s bar foo |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
14 echo '% now addremove should remove old files' |
7f0dd352fb4d
addremove: correctly handle intermediate symlinks
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
15 hg addremove |