Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue612 @ 5416:ca890c0c3f1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil.c: style fix - delete trailing end-of-line spaces
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Sun, 07 Oct 2007 21:56:36 +0300
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