view tests/test-rename-merge1 @ 3181:3637d5d17cbc

Documentation fixes for addremove. - It is no longer deprecated, but the short help still included (DEPRECATED). - Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 27 Sep 2006 21:43:45 +0200
parents c82ea81d6850
children c93ce7f10f85
line wrap: on
line source

#!/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"