##// END OF EJS Templates
merge: use scmutil.intrev() to sort ctx objects...
Yuya Nishihara -
r32655:9fbd8ad3 default
parent child Browse files
Show More
@@ -801,7 +801,7 b' def manifestmerge(repo, wctx, p2, pa, br'
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)
General Comments 0
You need to be logged in to leave comments. Login now