Mercurial > hg-stable
comparison tests/test-rename-merge1.t @ 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 | d4e62df1c73d |
| children | 91a0bc50b288 |
comparison
equal
deleted
inserted
replaced
| 42109:2a3c0106ded9 | 42110:3a7efcbdf288 |
|---|---|
| 35 checking for directory renames | 35 checking for directory renames |
| 36 resolving manifests | 36 resolving manifests |
| 37 branchmerge: True, force: False, partial: False | 37 branchmerge: True, force: False, partial: False |
| 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
| 39 note: possible conflict - a2 was renamed multiple times to: | 39 note: possible conflict - a2 was renamed multiple times to: |
| 40 b2 | |
| 40 c2 | 41 c2 |
| 41 b2 | |
| 42 preserving a for resolve of b | 42 preserving a for resolve of b |
| 43 removing a | 43 removing a |
| 44 b2: remote created -> g | 44 b2: remote created -> g |
| 45 getting b2 | 45 getting b2 |
| 46 b: remote moved from a -> m (premerge) | 46 b: remote moved from a -> m (premerge) |