equal
deleted
inserted
replaced
10 echo This is file b22 > b |
10 echo This is file b22 > b |
11 hg commit -m"comment #1" -d "1000000 0" |
11 hg commit -m"comment #1" -d "1000000 0" |
12 hg update 0 |
12 hg update 0 |
13 rm b |
13 rm b |
14 hg commit -A -m"comment #2" -d "1000000 0" |
14 hg commit -A -m"comment #2" -d "1000000 0" |
15 |
|
16 echo This is file a > a |
|
17 # in theory, we shouldn't need the "-y" below, but it prevents |
15 # in theory, we shouldn't need the "-y" below, but it prevents |
18 # this test from hanging when "hg update" erroneously prompts the |
16 # this test from hanging when "hg update" erroneously prompts the |
19 # user for "keep or delete" |
17 # user for "keep or delete" |
20 hg update -y 1 # should fail (unclean repo) |
|
21 hg revert a |
|
22 hg update -y 1 |
18 hg update -y 1 |
23 |
19 |
24 exit 0 |
20 exit 0 |