Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9 @ 4804:beb774707c52
test-archive: stop checking md5 absolute values
Different tar/zlib versions can generate different binaries.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 05 Jul 2007 20:39:03 +0200 |
parents | dc5920ea12f8 |
children |
line wrap: on
line source
#!/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