facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

make test-confused-revert check working dir with two parents.

Browse Source
This commit is contained in:
Vadim Gelfer 2006-05-05 10:45:08 -07:00
parent e1962a5447
commit 89c7098b13
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test-confused-revert
View File

@ -41,9 +41,12 @@ hg remove a
echo "%%% should show a removed and b added"
hg status
echo "reverting..."
echo "%%% revert should fail"
hg revert
echo "%%% revert should be ok now"
hg revert -r2
echo "%%% should show b unknown and a marked modified (merged)"
hg status

4
tests/test-confused-revert.out
View File

@ -16,7 +16,9 @@ foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% revert should fail
abort: working dir has two parents; you must specify the revision to revert to
%%% revert should be ok now
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)