Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9 @ 4694:6bf58c9400e2
mercurial.el: ignore errors on hg-after-save-hook()
Don't signal an error even if running hg command fails. Otherwise,
succeeding hooks won't be called.
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Tue, 22 May 2007 07:24:06 +0900 |
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