equal
deleted
inserted
replaced
353 t = mctx.filectx(f2).data() |
353 t = mctx.filectx(f2).data() |
354 repo.wwrite(fd, t, flags) |
354 repo.wwrite(fd, t, flags) |
355 updated += 1 |
355 updated += 1 |
356 elif m == "dr": # divergent renames |
356 elif m == "dr": # divergent renames |
357 fl = a[2] |
357 fl = a[2] |
358 repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f) |
358 repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
359 "multiple times to:\n") % f) |
359 for nf in fl: |
360 for nf in fl: |
360 repo.ui.warn(" %s\n" % nf) |
361 repo.ui.warn(" %s\n" % nf) |
361 elif m == "e": # exec |
362 elif m == "e": # exec |
362 flags = a[2] |
363 flags = a[2] |
363 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
364 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |