258 searching for copies back to rev 2 |
258 searching for copies back to rev 2 |
259 resolving manifests |
259 resolving manifests |
260 branchmerge: True, force: False, partial: False |
260 branchmerge: True, force: False, partial: False |
261 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
261 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
262 .hgsubstate: versions differ -> m |
262 .hgsubstate: versions differ -> m |
263 updating: .hgsubstate 1/1 files (100.00%) |
|
264 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
263 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
265 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
264 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
266 getting subrepo t |
265 getting subrepo t |
267 resolving manifests |
266 resolving manifests |
268 branchmerge: False, force: False, partial: False |
267 branchmerge: False, force: False, partial: False |
269 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
268 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
270 t: remote is newer -> g |
269 t: remote is newer -> g |
271 getting t |
270 getting t |
272 updating: t 1/1 files (100.00%) |
|
273 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
271 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
274 (branch merge, don't forget to commit) |
272 (branch merge, don't forget to commit) |
275 $ hg debugsub |
273 $ hg debugsub |
276 path s |
274 path s |
277 source s |
275 source s |
286 searching for copies back to rev 2 |
284 searching for copies back to rev 2 |
287 resolving manifests |
285 resolving manifests |
288 branchmerge: True, force: False, partial: False |
286 branchmerge: True, force: False, partial: False |
289 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
287 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
290 .hgsubstate: versions differ -> m |
288 .hgsubstate: versions differ -> m |
291 updating: .hgsubstate 1/1 files (100.00%) |
|
292 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
289 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
293 subrepo t: both sides changed |
290 subrepo t: both sides changed |
294 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
291 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
295 (M)erge, keep (l)ocal or keep (r)emote? m |
292 (M)erge, keep (l)ocal or keep (r)emote? m |
296 merging subrepo t |
293 merging subrepo t |
298 resolving manifests |
295 resolving manifests |
299 branchmerge: True, force: False, partial: False |
296 branchmerge: True, force: False, partial: False |
300 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
301 preserving t for resolve of t |
298 preserving t for resolve of t |
302 t: versions differ -> m |
299 t: versions differ -> m |
303 updating: t 1/1 files (100.00%) |
|
304 picked tool 'internal:merge' for t (binary False symlink False) |
300 picked tool 'internal:merge' for t (binary False symlink False) |
305 merging t |
301 merging t |
306 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
307 warning: conflicts during merge. |
303 warning: conflicts during merge. |
308 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
304 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |