Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 42110:3a7efcbdf288
copies: print list of divergent renames in sorted order
The current order is not obvious to the user (and I may change it in a
later patch). Lexicographical order seems like the obvious choice
here.
Differential Revision: https://phab.mercurial-scm.org/D6227
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 12 Apr 2019 09:41:08 -0700 |
| parents | 566daffc607d |
| children | beec7fc6adec |
comparison
equal
deleted
inserted
replaced
| 42109:2a3c0106ded9 | 42110:3a7efcbdf288 |
|---|---|
| 2129 | 2129 |
| 2130 # divergent renames | 2130 # divergent renames |
| 2131 for f, fl in sorted(diverge.iteritems()): | 2131 for f, fl in sorted(diverge.iteritems()): |
| 2132 repo.ui.warn(_("note: possible conflict - %s was renamed " | 2132 repo.ui.warn(_("note: possible conflict - %s was renamed " |
| 2133 "multiple times to:\n") % f) | 2133 "multiple times to:\n") % f) |
| 2134 for nf in fl: | 2134 for nf in sorted(fl): |
| 2135 repo.ui.warn(" %s\n" % nf) | 2135 repo.ui.warn(" %s\n" % nf) |
| 2136 | 2136 |
| 2137 # rename and delete | 2137 # rename and delete |
| 2138 for f, fl in sorted(renamedelete.iteritems()): | 2138 for f, fl in sorted(renamedelete.iteritems()): |
| 2139 repo.ui.warn(_("note: possible conflict - %s was deleted " | 2139 repo.ui.warn(_("note: possible conflict - %s was deleted " |
| 2140 "and renamed to:\n") % f) | 2140 "and renamed to:\n") % f) |
| 2141 for nf in fl: | 2141 for nf in sorted(fl): |
| 2142 repo.ui.warn(" %s\n" % nf) | 2142 repo.ui.warn(" %s\n" % nf) |
| 2143 | 2143 |
| 2144 ### apply phase | 2144 ### apply phase |
| 2145 if not branchmerge: # just jump to the new rev | 2145 if not branchmerge: # just jump to the new rev |
| 2146 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | 2146 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |