view tests/test-issue612 @ 5325:5971cfc0a56a

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Sep 2007 12:34:26 -0500
parents 9797124581c9
children
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