##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

make test-confused-revert check working dir with two parents.
Vadim Gelfer -
r2214:6c6c0e55 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -41,9 +41,12 b' hg remove a'
41 echo "%%% should show a removed and b added"
41 echo "%%% should show a removed and b added"
42 hg status
42 hg status
43
43
44 echo "reverting..."
44 echo "%%% revert should fail"
45 hg revert
45 hg revert
46
46
47 echo "%%% revert should be ok now"
48 hg revert -r2
49
47 echo "%%% should show b unknown and a marked modified (merged)"
50 echo "%%% should show b unknown and a marked modified (merged)"
48 hg status
51 hg status
49
52
Show file before | Show file after | Hide comments
@@ -16,7 +16,9 b' foo-b'
16 %%% should show a removed and b added
16 %%% should show a removed and b added
17 A b
17 A b
18 R a
18 R a
19 reverting...
19 %%% revert should fail
20 abort: working dir has two parents; you must specify the revision to revert to
21 %%% revert should be ok now
20 undeleting a
22 undeleting a
21 forgetting b
23 forgetting b
22 %%% should show b unknown and a marked modified (merged)
24 %%% should show b unknown and a marked modified (merged)
General Comments 0
You need to be logged in to leave comments. Login now