view tests/test-issue612 @ 11007:a0102da324ab stable

commands: revised documentation of 'default' and 'default-push' This patch was a collaborative effort between faheem, mg, timeless and ilowe.
author Faheem Mitha <faheem@email.unc.edu>
date Tue, 27 Apr 2010 00:44:06 +0530
parents 9797124581c9
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st