tests/test-rename-merge1
author Matt Mackall <mpm@selenic.com>
Tue, 26 Sep 2006 16:21:52 -0500
changeset 3163 a9e75b371315
parent 3155 c82ea81d6850
child 3257 c93ce7f10f85
permissions -rwxr-xr-x
merge: move partial filtering out of manifest merge

#!/bin/sh

mkdir t
cd t
hg init
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
cat a
cat b
hg ci -m "merge" -d "0 0"