Mercurial > hg
view tests/test-convert-bzr-merges @ 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 | 9e6d6568bf7a |
children | d65671beee7f |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" echo % test multiple merges at once mkdir test-multimerge cd test-multimerge bzr init -q source cd source echo content > file bzr add -q file bzr commit -q -m 'Initial add' cd .. bzr branch -q source source-branch1 cd source-branch1 echo morecontent >> file echo evenmorecontent > file-branch1 bzr add -q file-branch1 bzr commit -q -m 'Added branch1 file' cd ../source echo content > file-parent bzr add -q file-parent bzr commit -q -m 'Added parent file' cd .. bzr branch -q source source-branch2 cd source-branch2 echo somecontent > file-branch2 bzr add -q file-branch2 bzr commit -q -m 'Added brach2 file' cd ../source bzr merge -q ../source-branch1 bzr merge -q --force ../source-branch2 bzr commit -q -m 'Merged branches' cd .. hg convert --datesort source source-hg glog -R source-hg manifest source-hg tip