Mercurial > hg
view tests/test-convert-cvs.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 | 2011bb8ada9a |
children | 5edb2a8e29ea |
line wrap: on
line source
% create cvs repository % create source directory % import source directory N src/a N src/b/c No conflicts created by this import % checkout source directory U src/a U src/b/c % commit a new revision changing b/c checking in src/b/c,v % convert fresh repo initializing destination src-hg repository connecting to cvsrepo scanning source... sorting... converting... 2 Initial revision 1 import 0 ci0 updating tags a c c % convert fresh repo with --filemap initializing destination src-filemap repository connecting to cvsrepo scanning source... sorting... converting... 2 Initial revision 1 import rolling back last transaction 0 ci0 updating tags c c 2 update tags files: .hgtags 1 ci0 files: b/c 0 Initial revision files: b/c % commit new file revisions checking in src/a,v checking in src/b/c,v % convert again connecting to cvsrepo scanning source... sorting... converting... 0 ci1 a a c c c % convert again with --filemap connecting to cvsrepo scanning source... sorting... converting... 0 ci1 c c c 3 ci1 files: b/c 2 update tags files: .hgtags 1 ci0 files: b/c 0 Initial revision files: b/c % commit branch U b/c T a T b/c checking in src/b/c,v % convert again connecting to cvsrepo scanning source... sorting... converting... 0 ci2 a c d % convert again with --filemap connecting to cvsrepo scanning source... sorting... converting... 0 ci2 c d 4 ci2 files: b/c 3 ci1 files: b/c 2 update tags files: .hgtags 1 ci0 files: b/c 0 Initial revision files: b/c o 5 (branch) ci2 files: b/c | | o 4 () ci1 files: a b/c | | | o 3 () update tags files: .hgtags | | | o 2 () ci0 files: b/c |/ | o 1 (INITIAL) import files: |/ o 0 () Initial revision files: a b/c