Mercurial > hg
view tests/test-merge9 @ 8166:56719b1aa6f4
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 26 Apr 2009 11:49:17 +0200 |
parents | 30cb79d84352 |
children | 6c82beaaa11a |
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 hg st echo % re-resolve baz hg resolve baz echo % after hg resolve -l echo % resolve all warning hg resolve echo % resolve all hg resolve -a echo % after hg resolve -l true