22 overwrite False partial False |
22 overwrite False partial False |
23 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
23 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
24 a: versions differ -> m |
24 a: versions differ -> m |
25 b: remote created -> g |
25 b: remote created -> g |
26 preserving a for resolve of a |
26 preserving a for resolve of a |
27 update: a 1/2 files (50.00%) |
27 updating: a 1/2 files (50.00%) |
28 picked tool 'true' for a (binary False symlink False) |
28 picked tool 'true' for a (binary False symlink False) |
29 merging a |
29 merging a |
30 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
30 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
31 update: b 2/2 files (100.00%) |
31 updating: b 2/2 files (100.00%) |
32 getting b |
32 getting b |
33 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
33 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
34 changeset: 1:802f095af299 |
34 changeset: 1:802f095af299 |
35 tag: tip |
35 tag: tip |
36 user: test |
36 user: test |
41 overwrite False partial False |
41 overwrite False partial False |
42 ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b |
42 ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b |
43 a: versions differ -> m |
43 a: versions differ -> m |
44 b: other deleted -> r |
44 b: other deleted -> r |
45 preserving a for resolve of a |
45 preserving a for resolve of a |
46 update: b 1/2 files (50.00%) |
46 updating: b 1/2 files (50.00%) |
47 removing b |
47 removing b |
48 update: a 2/2 files (100.00%) |
48 updating: a 2/2 files (100.00%) |
49 picked tool 'true' for a (binary False symlink False) |
49 picked tool 'true' for a (binary False symlink False) |
50 merging a |
50 merging a |
51 my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
51 my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
52 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
52 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
53 changeset: 0:33aaa84a386b |
53 changeset: 0:33aaa84a386b |
69 overwrite False partial False |
69 overwrite False partial False |
70 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
70 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
71 a: versions differ -> m |
71 a: versions differ -> m |
72 b: remote created -> g |
72 b: remote created -> g |
73 preserving a for resolve of a |
73 preserving a for resolve of a |
74 update: a 1/2 files (50.00%) |
74 updating: a 1/2 files (50.00%) |
75 picked tool 'true' for a (binary False symlink False) |
75 picked tool 'true' for a (binary False symlink False) |
76 merging a |
76 merging a |
77 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
77 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
78 update: b 2/2 files (100.00%) |
78 updating: b 2/2 files (100.00%) |
79 getting b |
79 getting b |
80 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
80 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
81 changeset: 1:802f095af299 |
81 changeset: 1:802f095af299 |
82 tag: tip |
82 tag: tip |
83 user: test |
83 user: test |
126 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
126 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
127 a: versions differ -> m |
127 a: versions differ -> m |
128 b: versions differ -> m |
128 b: versions differ -> m |
129 preserving a for resolve of a |
129 preserving a for resolve of a |
130 preserving b for resolve of b |
130 preserving b for resolve of b |
131 update: a 1/2 files (50.00%) |
131 updating: a 1/2 files (50.00%) |
132 picked tool 'true' for a (binary False symlink False) |
132 picked tool 'true' for a (binary False symlink False) |
133 merging a |
133 merging a |
134 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
134 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
135 update: b 2/2 files (100.00%) |
135 updating: b 2/2 files (100.00%) |
136 picked tool 'true' for b (binary False symlink False) |
136 picked tool 'true' for b (binary False symlink False) |
137 merging b |
137 merging b |
138 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 |
138 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 |
139 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
139 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
140 (branch merge, don't forget to commit) |
140 (branch merge, don't forget to commit) |