equal
deleted
inserted
replaced
39 hg remove a |
39 hg remove a |
40 |
40 |
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 |
|
47 echo "%%% revert should be ok now" |
|
48 hg revert -r2 |
46 |
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 |
50 echo "%%% should show foo-b" |
53 echo "%%% should show foo-b" |