author | Bryan O'Sullivan <bos@serpentine.com> |
Thu, 26 Jul 2007 13:34:36 -0700 | |
changeset 5013 | 6c1029aacc9a |
parent 4681 | dc5920ea12f8 |
permissions | -rwxr-xr-x |
#!/bin/sh # test that we don't interrupt the merge session if # a file-level merge failed hg init repo cd repo echo foo > foo echo a > bar hg ci -Am 'add foo' -d '0 0' hg mv foo baz echo b >> bar echo quux > quux1 hg ci -Am 'mv foo baz' -d '0 0' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 hg ci -Am 'change foo' -d '0 0' # test with the rename on the remote side HGMERGE=false hg merge # test with the rename on the local side hg up -C 1 HGMERGE=false hg merge true