equal
deleted
inserted
replaced
2 |
2 |
3 hg init a |
3 hg init a |
4 cd a |
4 cd a |
5 touch empty1 |
5 touch empty1 |
6 hg add empty1 |
6 hg add empty1 |
7 hg commit -m 'add empty1' -d '1000000 0' |
7 hg commit -m 'add empty1' |
8 |
8 |
9 touch empty2 |
9 touch empty2 |
10 hg add empty2 |
10 hg add empty2 |
11 hg commit -m 'add empty2' -d '1000000 0' |
11 hg commit -m 'add empty2' |
12 |
12 |
13 hg up -C 0 |
13 hg up -C 0 |
14 touch empty3 |
14 touch empty3 |
15 hg add empty3 |
15 hg add empty3 |
16 hg commit -m 'add empty3' -d '1000000 0' |
16 hg commit -m 'add empty3' |
17 |
17 |
18 hg heads |
18 hg heads |
19 |
19 |
20 hg merge 1 |
20 hg merge 1 |
21 # before changeset 05257fd28591, we didn't notice the |
21 # before changeset 05257fd28591, we didn't notice the |
22 # empty file that came from rev 1. |
22 # empty file that came from rev 1. |
23 hg status |
23 hg status |
24 hg commit -m merge -d '1000000 0' |
24 hg commit -m merge |
25 hg manifest --debug tip |
25 hg manifest --debug tip |