Mercurial > hg
view tests/test-copy-move-merge.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 | 368a4ec603cc |
children | af5f099d932b |
line wrap: on
line source
1 files updated, 0 files merged, 2 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 searching for copies back to rev 1 unmatched files in other: b c all copies found (* = to merge, ! = divergent): c -> a * b -> a * checking for directory renames a: remote moved to c -> m a: remote moved to b -> m preserving a for resolve of b preserving a for resolve of c removing a picked tool 'internal:merge' for b (binary False symlink False) merging a and b to b my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 premerge successful picked tool 'internal:merge' for c (binary False symlink False) merging a and c to c my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 premerge successful 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- b -- 0 1 2 -- c -- 0 1 2