1271 "use (c)hanged version or leave (d)eleted?" |
1271 "use (c)hanged version or leave (d)eleted?" |
1272 "$$ &Changed $$ &Deleted") % f, 0) == 0: |
1272 "$$ &Changed $$ &Deleted") % f, 0) == 0: |
1273 actions['g'].append((f, (flags,), "prompt recreating")) |
1273 actions['g'].append((f, (flags,), "prompt recreating")) |
1274 del actions['dc'][:] |
1274 del actions['dc'][:] |
1275 |
1275 |
|
1276 # divergent renames |
|
1277 for f, fl in sorted(diverge.iteritems()): |
|
1278 repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
1279 "multiple times to:\n") % f) |
|
1280 for nf in fl: |
|
1281 repo.ui.warn(" %s\n" % nf) |
|
1282 |
|
1283 # rename and delete |
|
1284 for f, fl in sorted(renamedelete.iteritems()): |
|
1285 repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
1286 "and renamed to:\n") % f) |
|
1287 for nf in fl: |
|
1288 repo.ui.warn(" %s\n" % nf) |
|
1289 |
1276 ### apply phase |
1290 ### apply phase |
1277 if not branchmerge: # just jump to the new rev |
1291 if not branchmerge: # just jump to the new rev |
1278 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
1292 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
1279 if not partial: |
1293 if not partial: |
1280 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
1294 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
1281 # note that we're in the middle of an update |
1295 # note that we're in the middle of an update |
1282 repo.vfs.write('updatestate', p2.hex()) |
1296 repo.vfs.write('updatestate', p2.hex()) |
1283 |
1297 |
1284 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
1298 stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
1285 |
|
1286 # divergent renames |
|
1287 for f, fl in sorted(diverge.iteritems()): |
|
1288 repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
1289 "multiple times to:\n") % f) |
|
1290 for nf in fl: |
|
1291 repo.ui.warn(" %s\n" % nf) |
|
1292 |
|
1293 # rename and delete |
|
1294 for f, fl in sorted(renamedelete.iteritems()): |
|
1295 repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
1296 "and renamed to:\n") % f) |
|
1297 for nf in fl: |
|
1298 repo.ui.warn(" %s\n" % nf) |
|
1299 |
1299 |
1300 if not partial: |
1300 if not partial: |
1301 repo.dirstate.beginparentchange() |
1301 repo.dirstate.beginparentchange() |
1302 repo.setparents(fp1, fp2) |
1302 repo.setparents(fp1, fp2) |
1303 recordupdates(repo, actions, branchmerge) |
1303 recordupdates(repo, actions, branchmerge) |