# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2017-06-03 10:01:19
# Node ID 9fbd8ad398aaeebea1d28d69b78d4e84240cef80
# Parent  4bec8cce6a099e562edc7b9f6246e10d2b829fc5

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.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -801,7 +801,7 @@ def manifestmerge(repo, wctx, p2, pa, br
 
     # 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)