822 f0, flags = args |
822 f0, flags = args |
823 repo.ui.note(_("getting %s to %s\n") % (f0, f)) |
823 repo.ui.note(_("getting %s to %s\n") % (f0, f)) |
824 repo.wwrite(f, mctx.filectx(f0).data(), flags) |
824 repo.wwrite(f, mctx.filectx(f0).data(), flags) |
825 updated += 1 |
825 updated += 1 |
826 |
826 |
827 # divergent renames |
|
828 for f, args, msg in actions['dr']: |
|
829 fl, = args |
|
830 repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
831 "multiple times to:\n") % f) |
|
832 for nf in fl: |
|
833 repo.ui.warn(" %s\n" % nf) |
|
834 |
|
835 # rename and delete |
|
836 for f, args, msg in actions['rd']: |
|
837 fl, = args |
|
838 repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
839 "and renamed to:\n") % f) |
|
840 for nf in fl: |
|
841 repo.ui.warn(" %s\n" % nf) |
|
842 |
|
843 # exec |
827 # exec |
844 for f, args, msg in actions['e']: |
828 for f, args, msg in actions['e']: |
845 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) |
829 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) |
846 z += 1 |
830 z += 1 |
847 progress(_updating, z, item=f, total=numupdates, unit=_files) |
831 progress(_updating, z, item=f, total=numupdates, unit=_files) |
1114 # note that we're in the middle of an update |
1098 # note that we're in the middle of an update |
1115 repo.vfs.write('updatestate', p2.hex()) |
1099 repo.vfs.write('updatestate', p2.hex()) |
1116 |
1100 |
1117 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
1101 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
1118 |
1102 |
|
1103 # divergent renames |
|
1104 for f, args, msg in actions['dr']: |
|
1105 fl, = args |
|
1106 repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
1107 "multiple times to:\n") % f) |
|
1108 for nf in fl: |
|
1109 repo.ui.warn(" %s\n" % nf) |
|
1110 |
|
1111 # rename and delete |
|
1112 for f, args, msg in actions['rd']: |
|
1113 fl, = args |
|
1114 repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
1115 "and renamed to:\n") % f) |
|
1116 for nf in fl: |
|
1117 repo.ui.warn(" %s\n" % nf) |
|
1118 |
1119 if not partial: |
1119 if not partial: |
1120 repo.dirstate.beginparentchange() |
1120 repo.dirstate.beginparentchange() |
1121 repo.setparents(fp1, fp2) |
1121 repo.setparents(fp1, fp2) |
1122 recordupdates(repo, actions, branchmerge) |
1122 recordupdates(repo, actions, branchmerge) |
1123 # update completed, clear state |
1123 # update completed, clear state |