Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 12757:62c8f7691bc3
merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
Before:
$ hg up deadbeef
warning: detected divergent renames of X to:
...
After:
$ hg up deadbeef
note: possible conflict - X was renamed multiple times to:
...
No functionality change.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Sun, 10 Oct 2010 09:50:25 -0500 |
| parents | 8b438cb84c57 |
| children | 9e7e24052745 c19b9282d3a7 |
comparison
equal
deleted
inserted
replaced
| 12756:13f0acfa974a | 12757:62c8f7691bc3 |
|---|---|
| 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) |