view tests/test-issue612 @ 12192:968e9057ab8a

tests: unify test-filebranch
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 03 Sep 2010 11:47:24 +0200
parents 4c94b6d0fb1c
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama

hg mv src source
hg ci -Ammove

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

hg st

hg merge

hg st