equal
deleted
inserted
replaced
4 cd t |
4 cd t |
5 hg init |
5 hg init |
6 echo This is file a1 > a |
6 echo This is file a1 > a |
7 echo This is file b1 > b |
7 echo This is file b1 > b |
8 hg add a b |
8 hg add a b |
9 hg commit -t "commit #0" -d "0 0" -u user |
9 hg commit -m "commit #0" -d "0 0" |
10 echo This is file b22 > b |
10 echo This is file b22 > b |
11 hg commit -t"comment #1" -d "0 0" -u user |
11 hg commit -m"comment #1" -d "0 0" |
12 hg update 0 |
12 hg update 0 |
13 rm b |
13 rm b |
14 hg commit -A -t"comment #2" -d "0 0" -u user |
14 hg commit -A -m"comment #2" -d "0 0" |
15 # in theory, we shouldn't need the "yes k" below, but it prevents |
15 # in theory, we shouldn't need the "yes k" below, but it prevents |
16 # this test from hanging when "hg update" erroneously prompts the |
16 # this test from hanging when "hg update" erroneously prompts the |
17 # user for "keep or delete" |
17 # user for "keep or delete" |
18 yes k | hg update 1 |
18 yes k | hg update 1 |
19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing |
19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing |