Mercurial > hg
view tests/test-clone.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 | a7fcb43af82e |
children | a218ba5f60df |
line wrap: on
line source
% prepare repo a % list files in store/data (should show a 'b.d') .hg/store/data/a.i .hg/store/data/b.d .hg/store/data/b.i % default operation updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 11 changesets, 11 total revisions % no update a not present checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 11 changesets, 11 total revisions % default destination destination directory: a updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved a % check that we drop the file:// from the path before % writing the .hgrc updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % check that path aliases are expanded a#0 % use --pull requesting all changes adding changesets adding manifests adding file changes added 11 changesets with 11 changes to 2 files updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 11 changesets, 11 total revisions