Mercurial > hg
view tests/test-merge-prompt @ 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 | 8a65ea986755 |
children |
line wrap: on
line source
#!/bin/sh # # Test for b5605d88dc27 # Make ui.prompt repeat on "unrecognized response" again (issue897) # and for 840e2b315c1f # Fix misleading error and prompts during update/merge (issue556) status() { [ $? -ne 0 ] && echo "failed." echo "status:" hg st -A file1 file2 for file in file1 file2; do if [ -f $file ]; then echo "$file:" cat $file else echo "$file does not exist" fi done } hg init repo cd repo echo 1 > file1 echo 2 > file2 hg ci -Am 'added file1 and file2' # rev 0 hg rm file1 echo changed >> file2 hg ci -m 'removed file1, changed file2' # rev 1 hg co 0 echo changed >> file1 hg rm file2 hg ci -m 'changed file1, removed file2' # rev 2 echo echo "# non-interactive merge" hg merge -y || echo "failed" status echo echo "# interactive merge" hg co -C hg merge --config ui.interactive=true <<EOF || echo "failed" c d EOF status echo echo "# interactive merge with bad input" hg co -C hg merge --config ui.interactive=true <<EOF || echo "failed" foo bar d baz c EOF status echo echo "# interactive merge with not enough input" hg co -C hg merge --config ui.interactive=true <<EOF || echo "failed" d EOF status