12 pulling from ../test2 |
12 pulling from ../test2 |
13 searching for changes |
13 searching for changes |
14 adding changesets |
14 adding changesets |
15 adding manifests |
15 adding manifests |
16 adding file changes |
16 adding file changes |
17 added 1 changesets with 1 changes to 1 files (+1 heads) |
17 added 1 changesets with 0 changes to 0 files (+1 heads) |
18 (run 'hg heads' to see heads, 'hg merge' to merge) |
18 (run 'hg heads' to see heads, 'hg merge' to merge) |
19 changeset: 2:b833d578451e |
19 changeset: 2:37dccb76c058 |
20 tag: tip |
20 tag: tip |
21 parent: 0:4536b1c2ca69 |
21 parent: 0:4536b1c2ca69 |
22 user: test |
22 user: test |
23 date: Mon Jan 12 13:46:40 1970 +0000 |
23 date: Mon Jan 12 13:46:40 1970 +0000 |
24 summary: chmod +x a |
24 summary: chmod +x a |
26 changeset: 1:a187cb361a5a |
26 changeset: 1:a187cb361a5a |
27 user: test |
27 user: test |
28 date: Mon Jan 12 13:46:40 1970 +0000 |
28 date: Mon Jan 12 13:46:40 1970 +0000 |
29 summary: a updated |
29 summary: a updated |
30 |
30 |
31 changeset: 2:b833d578451e |
31 changeset: 2:37dccb76c058 |
32 tag: tip |
32 tag: tip |
33 parent: 0:4536b1c2ca69 |
33 parent: 0:4536b1c2ca69 |
34 user: test |
34 user: test |
35 date: Mon Jan 12 13:46:40 1970 +0000 |
35 date: Mon Jan 12 13:46:40 1970 +0000 |
36 summary: chmod +x a |
36 summary: chmod +x a |
44 user: test |
44 user: test |
45 date: Mon Jan 12 13:46:40 1970 +0000 |
45 date: Mon Jan 12 13:46:40 1970 +0000 |
46 summary: added a b |
46 summary: added a b |
47 |
47 |
48 resolving manifests |
48 resolving manifests |
49 merging a |
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
51 (branch merge, don't forget to commit) |
50 (branch merge, don't forget to commit) |
52 pulling from ../test2 |
51 pulling from ../test2 |
53 searching for changes |
52 searching for changes |
54 adding changesets |
53 adding changesets |
55 adding manifests |
54 adding manifests |
56 adding file changes |
55 adding file changes |
57 added 1 changesets with 1 changes to 1 files (+1 heads) |
56 added 1 changesets with 0 changes to 0 files (+1 heads) |
58 (run 'hg heads' to see heads, 'hg merge' to merge) |
57 (run 'hg heads' to see heads, 'hg merge' to merge) |
59 changeset: 2:b833d578451e |
58 changeset: 2:37dccb76c058 |
60 tag: tip |
59 tag: tip |
61 parent: 0:4536b1c2ca69 |
60 parent: 0:4536b1c2ca69 |
62 user: test |
61 user: test |
63 date: Mon Jan 12 13:46:40 1970 +0000 |
62 date: Mon Jan 12 13:46:40 1970 +0000 |
64 summary: chmod +x a |
63 summary: chmod +x a |
66 changeset: 1:d54568174d8e |
65 changeset: 1:d54568174d8e |
67 user: test |
66 user: test |
68 date: Mon Jan 12 13:46:40 1970 +0000 |
67 date: Mon Jan 12 13:46:40 1970 +0000 |
69 summary: b updated |
68 summary: b updated |
70 |
69 |
71 changeset: 2:b833d578451e |
70 changeset: 2:37dccb76c058 |
72 tag: tip |
71 tag: tip |
73 parent: 0:4536b1c2ca69 |
72 parent: 0:4536b1c2ca69 |
74 user: test |
73 user: test |
75 date: Mon Jan 12 13:46:40 1970 +0000 |
74 date: Mon Jan 12 13:46:40 1970 +0000 |
76 summary: chmod +x a |
75 summary: chmod +x a |
84 user: test |
83 user: test |
85 date: Mon Jan 12 13:46:40 1970 +0000 |
84 date: Mon Jan 12 13:46:40 1970 +0000 |
86 summary: added a b |
85 summary: added a b |
87 |
86 |
88 resolving manifests |
87 resolving manifests |
89 getting a |
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 (branch merge, don't forget to commit) |
89 (branch merge, don't forget to commit) |
92 -rwxr-x--- |
90 -rwxr-x--- |
93 -rwxr-x--- |
91 -rwxr-x--- |
94 -rwxr-x--- |
92 -rwxr-x--- |
95 rev offset length base linkrev nodeid p1 p2 |
93 rev offset length base linkrev nodeid p1 p2 |
96 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
94 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
97 1 0 0 0 2 37c42bd6cc03 b80de5d13875 000000000000 |
|
98 rev offset length base linkrev nodeid p1 p2 |
95 rev offset length base linkrev nodeid p1 p2 |
99 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
96 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
100 1 0 0 0 1 37c42bd6cc03 b80de5d13875 000000000000 |
|
101 rev offset length base linkrev nodeid p1 p2 |
97 rev offset length base linkrev nodeid p1 p2 |
102 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
98 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
103 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000 |
99 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000 |
104 2 5 0 2 2 37c42bd6cc03 b80de5d13875 000000000000 |
|