facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

merge: use scmutil.intrev() to sort ctx objects

Browse Source 
This moves wctx to the last, but that shouldn't matter. Only the order of
stored revisions is important.
This commit is contained in:
Yuya Nishihara 2017-06-03 19:01:19 +09:00
parent ca7d54c6e1
commit 6194f1a680
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/merge.py
View File

@ -801,7 +801,7 @@ def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher,
# manifests fetched in order are going to be faster, so prime the caches
[x.manifest() for x in
sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev() or -1)]
sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)]
if followcopies:
ret = copies.mergecopies(repo, wctx, p2, pa)