148 grafting revision 5 |
148 grafting revision 5 |
149 searching for copies back to rev 1 |
149 searching for copies back to rev 1 |
150 resolving manifests |
150 resolving manifests |
151 branchmerge: True, force: True, partial: False |
151 branchmerge: True, force: True, partial: False |
152 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
152 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
|
153 b: keep -> k |
153 e: remote is newer -> g |
154 e: remote is newer -> g |
154 getting e |
155 getting e |
155 updating: e 1/1 files (100.00%) |
156 updating: e 1/1 files (100.00%) |
156 e |
157 e |
157 grafting revision 4 |
158 grafting revision 4 |
158 searching for copies back to rev 1 |
159 searching for copies back to rev 1 |
159 resolving manifests |
160 resolving manifests |
160 branchmerge: True, force: True, partial: False |
161 branchmerge: True, force: True, partial: False |
161 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
162 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
|
163 b: keep -> k |
162 d: remote is newer -> g |
164 d: remote is newer -> g |
163 e: versions differ -> m |
165 e: versions differ -> m |
164 preserving e for resolve of e |
166 preserving e for resolve of e |
165 getting d |
167 getting d |
166 updating: d 1/2 files (50.00%) |
168 updating: d 1/2 files (50.00%) |