Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue612 @ 5438:a19167001251

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-darcs: don't let $HOME/.darcs pollute the test environment
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 10 Oct 2007 15:48:08 -0700
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