Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 32657:9fbd8ad398aa
merge: use scmutil.intrev() to sort ctx objects
This moves wctx to the last, but that shouldn't matter. Only the order of
stored revisions is important.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 03 Jun 2017 19:01:19 +0900 |
| parents | 49e1e5acb8ff |
| children | 9e3733d93f64 |
comparison
equal
deleted
inserted
replaced
| 32656:4bec8cce6a09 | 32657:9fbd8ad398aa |
|---|---|
| 799 | 799 |
| 800 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {} | 800 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {} |
| 801 | 801 |
| 802 # manifests fetched in order are going to be faster, so prime the caches | 802 # manifests fetched in order are going to be faster, so prime the caches |
| 803 [x.manifest() for x in | 803 [x.manifest() for x in |
| 804 sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev() or -1)] | 804 sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)] |
| 805 | 805 |
| 806 if followcopies: | 806 if followcopies: |
| 807 ret = copies.mergecopies(repo, wctx, p2, pa) | 807 ret = copies.mergecopies(repo, wctx, p2, pa) |
| 808 copy, movewithdir, diverge, renamedelete, dirmove = ret | 808 copy, movewithdir, diverge, renamedelete, dirmove = ret |
| 809 | 809 |