equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 hg --debug init |
2 hg --debug init |
3 echo this is a1 > a |
3 echo this is a1 > a |
4 hg add a |
4 hg add a |
5 hg commit -m0 -d "0 0" |
5 hg commit -m0 -d "1000000 0" |
6 echo this is b1 > b |
6 echo this is b1 > b |
7 hg add b |
7 hg add b |
8 hg commit -m1 -d "0 0" |
8 hg commit -m1 -d "1000000 0" |
9 hg manifest 1 |
9 hg manifest 1 |
10 echo this is c1 > c |
10 echo this is c1 > c |
11 hg rawcommit -p 1 -d "0 0" -m2 c |
11 hg rawcommit -p 1 -d "1000000 0" -m2 c |
12 hg manifest 2 |
12 hg manifest 2 |
13 hg parents |
13 hg parents |
14 rm b |
14 rm b |
15 hg rawcommit -p 2 -d "0 0" -m3 b |
15 hg rawcommit -p 2 -d "1000000 0" -m3 b |
16 hg manifest 3 |
16 hg manifest 3 |
17 hg parents |
17 hg parents |
18 echo this is a22 > a |
18 echo this is a22 > a |
19 hg rawcommit -p 3 -d "0 0" -m4 a |
19 hg rawcommit -p 3 -d "1000000 0" -m4 a |
20 hg manifest 4 |
20 hg manifest 4 |
21 hg parents |
21 hg parents |
22 echo this is c22 > c |
22 echo this is c22 > c |
23 hg rawcommit -p 1 -d "0 0" -m5 c |
23 hg rawcommit -p 1 -d "1000000 0" -m5 c |
24 hg manifest 5 |
24 hg manifest 5 |
25 hg parents |
25 hg parents |
26 # merge, but no files changed |
26 # merge, but no files changed |
27 hg rawcommit -p 4 -p 5 -d "0 0" -m6 |
27 hg rawcommit -p 4 -p 5 -d "1000000 0" -m6 |
28 hg manifest 6 |
28 hg manifest 6 |
29 hg parents |
29 hg parents |
30 # no changes what-so-ever |
30 # no changes what-so-ever |
31 hg rawcommit -p 6 -d "0 0" -m7 |
31 hg rawcommit -p 6 -d "1000000 0" -m7 |
32 hg manifest 7 |
32 hg manifest 7 |
33 hg parents |
33 hg parents |