tests/test-confused-revert
author Chris Mason <mason@suse.com>
Thu, 20 Apr 2006 13:08:16 -0400
changeset 2101 c6c019fd5db1
parent 1933 7544700fd931
child 2214 6c6c0e5595a2
permissions -rwxr-xr-x
Make bundlerepo use proper index format for revlogng bundlerepo just appends index entries from the bundle onto the index for the current repo. This patch makes sure it appends the correct format.

#!/bin/sh

hg init
echo foo > a
hg add a
hg commit -m "1" -d "1000000 0"

echo bar > b
hg add b
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "reverting..."
hg revert

echo "%%% should show b unknown and a back to normal"
hg status

rm b

hg co -C 0
echo foo-a > a
hg commit -m "2a" -d "1000000 0"

hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "1000000 0"

HGMERGE=true hg update -m 1

echo "%%% should show foo-b"
cat a

echo bar > b
hg add b
rm a
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "reverting..."
hg revert

echo "%%% should show b unknown and a marked modified (merged)"
hg status

echo "%%% should show foo-b"
cat a