Mercurial > hg

view tests/test-issue612 @ 6410:644a56c7ae79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug introduced by 894875eae49b (short not defined)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 30 Mar 2008 22:22:53 +0200
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