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