view tests/test-push-warn @ 1664:4338e33c973b

Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 9c918287d10b
children 7544700fd931
line wrap: on
line source

#!/bin/sh

mkdir a
cd a
hg init
echo foo > t1
hg add t1
hg commit -m "1" -d "0 0"

cd ..
hg clone a b

cd a
echo foo > t2
hg add t2
hg commit -m "2" -d "0 0"

cd ../b
echo foo > t3
hg add t3
hg commit -m "3" -d "0 0"

hg push ../a
hg pull ../a
hg push ../a
hg up -m
hg commit -m "4" -d "0 0"
hg push ../a