tests/test-merge4
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 18 Oct 2005 17:56:50 -0700
changeset 1398 3f76ac60130d
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
make update quieter when nothing is wrong sometimes when i am going around in my history, i get long lists of errors from the update command. this patch will fix that. i tried to make the code style the same like the rest of the code.

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