tests/test-merge8
author NIIMI Satoshi <sa2c@sa2c.net>
Tue, 22 May 2007 07:24:06 +0900
changeset 4694 6bf58c9400e2
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
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.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update