view tests/test-revert @ 1700:e2f91e0acbb8

hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Mon, 06 Feb 2006 17:32:06 -0600
parents 2bc6cd62a29c
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo 123 > a
echo 123 > c
hg add a c
hg commit -m "first" -d "0 0" a c
echo 123 > b
echo %% should show b unknown
hg status
echo 12 > c
echo %% should show b unknown and c modified
hg status
hg add b
echo %% should show b added and c modified
hg status
hg rm a
echo %% should show a removed, b added and c modified
hg status
hg revert a
echo %% should show b added and c modified
hg status
hg revert b
echo %% should show b unknown and c modified
hg status
hg revert c
echo %% should show b unknown
hg status
echo %% should show a b and c
ls

true