1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 created new head |
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 (branch merge, don't forget to commit) |
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 (branch merge, don't forget to commit) |
|
8 created new head |
|
9 changeset: 4:f6c172c6198c |
|
10 tag: tip |
|
11 parent: 1:448a8c5e42f1 |
|
12 parent: 2:7c5dc2e857f2 |
|
13 user: test |
|
14 date: Mon Jan 12 13:46:40 1970 +0000 |
|
15 summary: merge a/b -> blah |
|
16 |
|
17 changeset: 3:13d875a22764 |
|
18 parent: 2:7c5dc2e857f2 |
|
19 parent: 1:448a8c5e42f1 |
|
20 user: test |
|
21 date: Mon Jan 12 13:46:40 1970 +0000 |
|
22 summary: merge b/a -> blah |
|
23 |
|
24 changeset: 2:7c5dc2e857f2 |
|
25 parent: 0:dc1751ec2e9d |
|
26 user: test |
|
27 date: Mon Jan 12 13:46:40 1970 +0000 |
|
28 summary: branch b |
|
29 |
|
30 changeset: 1:448a8c5e42f1 |
|
31 user: test |
|
32 date: Mon Jan 12 13:46:40 1970 +0000 |
|
33 summary: branch a |
|
34 |
|
35 changeset: 0:dc1751ec2e9d |
|
36 user: test |
|
37 date: Mon Jan 12 13:46:40 1970 +0000 |
|
38 summary: test |
|
39 |
|
40 rev offset length base linkrev nodeid p1 p2 |
|
41 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 |
|
42 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 |
|
43 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 |
|
44 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 |
|
45 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 |
|
46 |
|
47 1 |
|
48 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
|
49 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b |
|
50 2 |
|
51 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a |
|
52 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
|
53 3 |
|
54 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
|
55 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
|
56 4 |
|
57 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
|
58 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
|
59 |
|
60 rev offset length base linkrev nodeid p1 p2 |
|
61 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
62 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 |
|
63 checking changesets |
|
64 checking manifests |
|
65 crosschecking files in changesets and manifests |
|
66 checking files |
|
67 2 files, 5 changesets, 4 total revisions |
|