2 |
2 |
3 $ echo foo > a |
3 $ echo foo > a |
4 $ echo foo > b |
4 $ echo foo > b |
5 $ hg add a b |
5 $ hg add a b |
6 |
6 |
7 $ hg ci -m "test" -d "1000000 0" |
7 $ hg ci -m "test" |
8 |
8 |
9 $ echo blah > a |
9 $ echo blah > a |
10 |
10 |
11 $ hg ci -m "branch a" -d "1000000 0" |
11 $ hg ci -m "branch a" |
12 |
12 |
13 $ hg co 0 |
13 $ hg co 0 |
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 |
15 |
16 $ echo blah > b |
16 $ echo blah > b |
17 |
17 |
18 $ hg ci -m "branch b" -d "1000000 0" |
18 $ hg ci -m "branch b" |
19 created new head |
19 created new head |
20 $ HGMERGE=true hg merge 1 |
20 $ HGMERGE=true hg merge 1 |
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22 (branch merge, don't forget to commit) |
22 (branch merge, don't forget to commit) |
23 |
23 |
24 $ hg ci -m "merge b/a -> blah" -d "1000000 0" |
24 $ hg ci -m "merge b/a -> blah" |
25 |
25 |
26 $ hg co 1 |
26 $ hg co 1 |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 $ HGMERGE=true hg merge 2 |
28 $ HGMERGE=true hg merge 2 |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30 (branch merge, don't forget to commit) |
30 (branch merge, don't forget to commit) |
31 $ hg ci -m "merge a/b -> blah" -d "1000000 0" |
31 $ hg ci -m "merge a/b -> blah" |
32 created new head |
32 created new head |
33 |
33 |
34 $ hg log |
34 $ hg log |
35 changeset: 4:f6c172c6198c |
35 changeset: 4:2ee31f665a86 |
36 tag: tip |
36 tag: tip |
37 parent: 1:448a8c5e42f1 |
37 parent: 1:96155394af80 |
38 parent: 2:7c5dc2e857f2 |
38 parent: 2:92cc4c306b19 |
39 user: test |
39 user: test |
40 date: Mon Jan 12 13:46:40 1970 +0000 |
40 date: Thu Jan 01 00:00:00 1970 +0000 |
41 summary: merge a/b -> blah |
41 summary: merge a/b -> blah |
42 |
42 |
43 changeset: 3:13d875a22764 |
43 changeset: 3:e16a66a37edd |
44 parent: 2:7c5dc2e857f2 |
44 parent: 2:92cc4c306b19 |
45 parent: 1:448a8c5e42f1 |
45 parent: 1:96155394af80 |
46 user: test |
46 user: test |
47 date: Mon Jan 12 13:46:40 1970 +0000 |
47 date: Thu Jan 01 00:00:00 1970 +0000 |
48 summary: merge b/a -> blah |
48 summary: merge b/a -> blah |
49 |
49 |
50 changeset: 2:7c5dc2e857f2 |
50 changeset: 2:92cc4c306b19 |
51 parent: 0:dc1751ec2e9d |
51 parent: 0:5e0375449e74 |
52 user: test |
52 user: test |
53 date: Mon Jan 12 13:46:40 1970 +0000 |
53 date: Thu Jan 01 00:00:00 1970 +0000 |
54 summary: branch b |
54 summary: branch b |
55 |
55 |
56 changeset: 1:448a8c5e42f1 |
56 changeset: 1:96155394af80 |
57 user: test |
57 user: test |
58 date: Mon Jan 12 13:46:40 1970 +0000 |
58 date: Thu Jan 01 00:00:00 1970 +0000 |
59 summary: branch a |
59 summary: branch a |
60 |
60 |
61 changeset: 0:dc1751ec2e9d |
61 changeset: 0:5e0375449e74 |
62 user: test |
62 user: test |
63 date: Mon Jan 12 13:46:40 1970 +0000 |
63 date: Thu Jan 01 00:00:00 1970 +0000 |
64 summary: test |
64 summary: test |
65 |
65 |
66 $ hg debugindex .hg/store/00changelog.i |
66 $ hg debugindex .hg/store/00changelog.i |
67 rev offset length base linkrev nodeid p1 p2 |
67 rev offset length base linkrev nodeid p1 p2 |
68 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 |
68 0 0 60 0 0 5e0375449e74 000000000000 000000000000 |
69 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 |
69 1 60 62 1 1 96155394af80 5e0375449e74 000000000000 |
70 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 |
70 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000 |
71 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 |
71 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 |
72 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 |
72 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 |
73 |
73 |
74 revision 1 |
74 revision 1 |
75 $ hg manifest --debug 1 |
75 $ hg manifest --debug 1 |
76 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
76 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
77 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b |
77 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b |