1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 created new head |
|
3 merging bar and foo to bar |
|
4 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
5 (branch merge, don't forget to commit) |
|
6 % contents of bar should be line0 line1 line2 |
|
7 line0 |
|
8 line1 |
|
9 line2 |
|
10 rev offset length base linkrev nodeid p1 p2 |
|
11 0 0 77 0 2 d35118874825 000000000000 000000000000 |
|
12 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
|
13 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
|
14 rev offset length base linkrev nodeid p1 p2 |
|
15 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
16 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 created new head |
|
19 4:2263c1be0967 2:0f2ff26688b9 |
|
20 3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d |
|
21 2:0f2ff26688b9 0:2665aaee66e9 |
|
22 1:5cd961e4045d |
|
23 0:2665aaee66e9 |
|
24 % this should use bar@rev2 as the ancestor |
|
25 searching for copies back to rev 1 |
|
26 resolving manifests |
|
27 overwrite None partial False |
|
28 ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 |
|
29 bar: versions differ -> m |
|
30 preserving bar for resolve of bar |
|
31 updating: bar 1/1 files (100.00%) |
|
32 picked tool 'internal:merge' for bar (binary False symlink False) |
|
33 merging bar |
|
34 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
|
35 premerge successful |
|
36 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
37 (branch merge, don't forget to commit) |
|
38 % contents of bar should be line1 line2 |
|
39 line1 |
|
40 line2 |
|
41 rev offset length base linkrev nodeid p1 p2 |
|
42 0 0 77 0 2 d35118874825 000000000000 000000000000 |
|
43 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
|
44 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 |
|
45 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
|
46 |
|
47 |
|
48 requesting all changes |
|
49 adding changesets |
|
50 adding manifests |
|
51 adding file changes |
|
52 added 3 changesets with 3 changes to 2 files (+1 heads) |
|
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
54 merging foo and bar to bar |
|
55 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
56 (branch merge, don't forget to commit) |
|
57 % contents of bar should be line0 line1 line2 |
|
58 line0 |
|
59 line1 |
|
60 line2 |
|
61 rev offset length base linkrev nodeid p1 p2 |
|
62 0 0 77 0 2 d35118874825 000000000000 000000000000 |
|
63 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
|
64 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
|
65 rev offset length base linkrev nodeid p1 p2 |
|
66 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
67 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 created new head |
|
70 4:2263c1be0967 2:0f2ff26688b9 |
|
71 3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 |
|
72 2:0f2ff26688b9 0:2665aaee66e9 |
|
73 1:5cd961e4045d |
|
74 0:2665aaee66e9 |
|
75 % this should use bar@rev2 as the ancestor |
|
76 searching for copies back to rev 1 |
|
77 resolving manifests |
|
78 overwrite None partial False |
|
79 ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 |
|
80 bar: versions differ -> m |
|
81 preserving bar for resolve of bar |
|
82 updating: bar 1/1 files (100.00%) |
|
83 picked tool 'internal:merge' for bar (binary False symlink False) |
|
84 merging bar |
|
85 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
|
86 premerge successful |
|
87 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
88 (branch merge, don't forget to commit) |
|
89 % contents of bar should be line1 line2 |
|
90 line1 |
|
91 line2 |
|
92 rev offset length base linkrev nodeid p1 p2 |
|
93 0 0 77 0 2 d35118874825 000000000000 000000000000 |
|
94 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 |
|
95 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 |
|
96 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
|