mercurial-crew-with-dirclash: tests/test-merge4@6bf58c9400e2

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-merge4

author	NIIMI Satoshi <sa2c@sa2c.net>
	Tue, 22 May 2007 07:24:06 +0900
changeset 4694	6bf58c9400e2
parent 2283	e506c14382fd
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

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"

mercurial-crew-with-dirclash

RSS Atom