Mercurial > hg
annotate tests/test-convert-bzr-merges.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 |
| rev | line source |
|---|---|
| 7053 | 1 % test multiple merges at once |
| 2 initializing destination source-hg repository | |
| 3 scanning source... | |
| 4 sorting... | |
| 5 converting... | |
| 6 4 Initial add | |
| 7 3 Added branch1 file | |
| 8 2 Added parent file | |
| 9 1 Added brach2 file | |
| 10 0 Merged branches | |
| 11 o 5 "(octopus merge fixup)" files: | |
| 12 |\ | |
| 13 | o 4 "Merged branches" files: file-branch2 | |
| 14 | |\ | |
| 15 o---+ 3 "Added brach2 file" files: file-branch2 | |
| 16 / / | |
| 17 | o 2 "Added parent file" files: file-parent | |
| 18 | | | |
| 19 o | 1 "Added branch1 file" files: file file-branch1 | |
| 20 |/ | |
| 21 o 0 "Initial add" files: file | |
| 22 | |
| 23 % manifest of tip | |
| 24 644 file | |
| 25 644 file-branch1 | |
| 26 644 file-branch2 | |
| 27 644 file-parent |