mercurial-crew-with-dirclash: tests/test-merge4@c4d577262d00

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

tests/test-merge4

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Sat, 11 Mar 2006 21:33:19 -0800
changeset 1885	c4d577262d00
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x

run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.


#!/bin/sh

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

mercurial-crew-with-dirclash

RSS Atom