tests/test-merge4
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 28 Jul 2006 10:46:25 -0700
changeset 2719 532809ba1db5
parent 2283 e506c14382fd
permissions -rwxr-xr-x
hg.py: add islocal() and defaultdest() functions, refactor islocal tells if a repo or url is local. defaultdest returns default path for clone if explicit path not given. clone can now take repo or url as source

#!/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"