Mercurial > hg
view tests/test-issue1175.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 | 03916abdfb64 |
children | f2618cacb485 |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved warning: detected divergent renames of a to: a2 a1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding a b b: searching for copy revision for a b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db committed changeset 5:755e75751bf67eb4378bca61987df035d90a7a06 checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 6 changesets, 4 total revisions # HG changeset patch # User test # Date 0 0 # Node ID 755e75751bf67eb4378bca61987df035d90a7a06 # Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d 5 diff --git a/b b/b new file mode 100644