tests/test-merge-remove
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Tue, 16 Mar 2010 19:52:58 +0100
changeset 10718 f18c37fd624f
parent 6299 653ddd1d7cd7
permissions -rwxr-xr-x
check-code: Add a ``maxerr`` argument to the ``checkfile`` function check-code.py used to halt after 15 errors. This changeset adds a new argument to the checkfile function to control this limit.

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