Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue612 @ 5190:da1658d63647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move enabling of demandimport to dispatch.py This avoids loading many modules before enabling demandimport.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 17:33:27 -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