tests/test-rename-merge1
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 09 Oct 2006 15:44:20 +0200
changeset 3293 a225055b3b59
parent 3257 c93ce7f10f85
child 3295 764688cf51e5
permissions -rwxr-xr-x
bundle --base: use the right set for the base

#!/bin/sh

mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start" -d "0 0"
hg mv a b
hg mv a2 b2
hg ci -m "rename" -d "0 0"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify" -d "0 0"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge" -d "0 0"