view tests/test-issue612 @ 8033:aeb4a5c7a28e

commands: consistently write switches as -a/--abc
author Martin Geisler <mg@lazybytes.net>
date Wed, 08 Apr 2009 21:20:31 +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