Mercurial > hg
view tests/test-convert-bzr.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 | 209ef5f3534c |
children | dbcf5d52fcf5 |
line wrap: on
line source
% create and rename on the same file in the same step a => b initializing destination source-hg repository scanning source... sorting... converting... 1 Initial add: a 0 rename a into b, create a o 1 "rename a into b, create a" files: a b | o 0 "Initial add: a" files: a % test --rev option initializing destination source-1-hg repository scanning source... sorting... converting... 0 Initial add: a o 0 "Initial add: a" files: a % merge initializing destination source-hg repository scanning source... sorting... converting... 3 Initial add 2 Editing a 1 Editing b 0 Merged improve branch o 3 "Merged improve branch" files: |\ | o 2 "Editing b" files: b | | o | 1 "Editing a" files: a |/ o 0 "Initial add" files: a b % symlinks and executable files initializing destination source-hg repository scanning source... sorting... converting... 1 Initial setup 0 Symlink changed, x bits changed % manifest of 0 644 altname 755 * program % manifest of tip 644 altname 755 * newprog 644 program