view tests/test-convert-hg-sink.out @ 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 e7ed5d07cc4c
children 68e0a55eee6e
line wrap: on
line source

changeset:   3:593cbf6fb2b4
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Added tag some-tag for changeset ad681a868e44

changeset:   2:ad681a868e44
tag:         some-tag
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo/file

changeset:   1:cbba8ecc03b7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     remove foo

changeset:   0:327daa9251fa
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo and bar

initializing destination new repository
scanning source...
sorting...
converting...
3 add foo and bar
2 remove foo
1 add foo/file
0 Added tag some-tag for changeset ad681a868e44
comparing with ../orig
searching for changes
no changes found
% dirstate should be empty:
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% put something in the dirstate:
a   0         -1 unset               baz
copy: bar -> baz
% add a new revision in the original repo
scanning source...
sorting...
converting...
0 add baz
comparing with ../orig
searching for changes
no changes found
% dirstate should be the same (no output below):
% no copies
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
baz not renamed