Mercurial > hg
view tests/test-merge-prompt @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
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