Mercurial > hg
view tests/test-merge-prompt @ 6805:482581431dcd
Sort removes first when applying updates (fixes issues 750 and 912)
This change ensures that removes happen first in applyupdates(). This avoids
issues where we try to make a case-only rename of a file on a case insensitive
system. Without this patch, the add of the new name happens before the remove
of the old one - which results in the file not existing, as the two names are
effectively the same.
With the patch, the old name gets removed then the new one gets added, which
is always safe.
author | Paul Moore <p.f.moore@gmail.com> |
---|---|
date | Tue, 01 Jul 2008 17:59:31 +0100 |
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