358 (overwrite, branchmerge, bool(partial))) |
358 (overwrite, branchmerge, bool(partial))) |
359 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
359 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
360 (short(p1), short(p2), short(pa))) |
360 (short(p1), short(p2), short(pa))) |
361 |
361 |
362 action = [] |
362 action = [] |
363 |
|
364 copy = {} |
363 copy = {} |
365 if not (backwards or overwrite): |
|
366 copy = findcopies(repo, m1, m2, repo.changelog.rev(pa)) |
|
367 |
364 |
368 m1 = workingmanifest(repo, m1, status) |
365 m1 = workingmanifest(repo, m1, status) |
369 |
366 |
370 if not force: |
367 if not force: |
371 checkunknown(repo, m2, status) |
368 checkunknown(repo, m2, status) |
372 if not branchmerge: |
369 if not branchmerge: |
373 action += forgetremoved(m2, status) |
370 action += forgetremoved(m2, status) |
|
371 if not (backwards or overwrite): |
|
372 copy = findcopies(repo, m1, m2, repo.changelog.rev(pa)) |
374 |
373 |
375 action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial) |
374 action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial) |
376 del m1, m2, ma |
375 del m1, m2, ma |
377 |
376 |
378 ### apply phase |
377 ### apply phase |