Mercurial > hg
view tests/test-convert-hg-svn.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 | 0750f11152fe |
| children | ea26ac58bbe3 |
line wrap: on
line source
Checked out revision 0. A a Adding a Transmitting file data . Committed revision 1. % initial roundtrip scanning source... sorting... converting... 0 added a scanning source... sorting... converting... % second roundtrip should do nothing scanning source... sorting... converting... scanning source... sorting... converting... % new hg rev updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo hg to svn scanning source... sorting... converting... 0 b % svn back to hg should do nothing scanning source... sorting... converting... % hg back to svn should do nothing scanning source... sorting... converting...