Mercurial > hg
view tests/test-merge9 @ 7272:9105467b8167
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 28 Oct 2008 00:03:28 +0100 |
parents | 92ccccb55ba3 |
children | 5a14a8f3b909 |
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 hg resolve -l # test with the rename on the local side hg up -C 1 HGMERGE=false hg merge echo % show unresolved hg resolve -l echo % unmark baz hg resolve -u baz echo % show hg resolve -l echo % re-resolve baz hg resolve baz echo % after hg resolve -l echo % resolve all hg resolve echo % after hg resolve -l true