tests/test-confused-revert
author Johannes Stezenbach <js@linuxtv.org>
Tue, 07 Feb 2006 23:01:11 -0600
changeset 1705 4b5725a4a0a6
parent 1449 30146be3437c
child 1933 7544700fd931
permissions -rwxr-xr-x
add changenav at bottom of page if one reads through the changelog and wants to go to the previous or next page one needs the navigation links at the bottom, not at the top of the page

#!/bin/sh

hg init
echo foo > a
hg add a
hg commit -m "1" -d "0 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 "0 0"

hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "0 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