tests/test-merge-remove
author David Greenaway <hg-dev@davidgreenaway.com>
Sat, 03 Apr 2010 11:58:16 +1100
changeset 11059 ef4aa90b1e58
parent 6299 653ddd1d7cd7
permissions -rwxr-xr-x
Move 'findrenames' code into its own file. The next few patches will increase the size of the "findrenames" functionality. This patch simply moves the function into its own file to avoid clutter building up in 'cmdutil.py'.

#!/bin/sh

hg init repo
cd repo

echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar'

echo foo2 >> foo
echo bleh > bar
hg ci -m 'change foo bar'

hg up -qC 0
hg mv foo foo1
echo foo1 > foo1
hg cat foo >> foo1
hg ci -m 'mv foo foo1'

hg merge
hg debugstate --nodates
hg st -q

echo '% removing foo1 and bar'
cp foo1 F
cp bar B
hg rm -f foo1 bar
hg debugstate --nodates
hg st -qC

echo '% readding foo1 and bar'
cp F foo1
cp B bar
hg add -v foo1 bar
hg debugstate --nodates
hg st -qC

echo '% reverting foo1 and bar'
hg revert -vr . foo1 bar
hg debugstate --nodates
hg st -qC
hg diff