# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1432669967 18000
# Node ID 6ac860f700b5cfeda232d5305963047696b869ca
# Parent  947771ad5174fef25519ffa375dc47667db0c2fc# Parent  708b19c18adf542dffd8754ae4c9e24042a52586
merge with stable

diff -r 947771ad5174 -r 6ac860f700b5 mercurial/copies.py
--- a/mercurial/copies.py	Fri May 22 14:02:04 2015 -0700
+++ b/mercurial/copies.py	Tue May 26 14:52:47 2015 -0500
@@ -451,7 +451,7 @@
 
         g1, g2 = f1.ancestors(), f2.ancestors()
         try:
-            f1r, f2r = f1.rev(), f2.rev()
+            f1r, f2r = f1.linkrev(), f2.linkrev()
 
             if f1r is None:
                 f1 = g1.next()
@@ -459,7 +459,7 @@
                 f2 = g2.next()
 
             while True:
-                f1r, f2r = f1.rev(), f2.rev()
+                f1r, f2r = f1.linkrev(), f2.linkrev()
                 if f1r > f2r:
                     f1 = g1.next()
                 elif f2r > f1r:
@@ -474,7 +474,7 @@
     of = None
     seen = set([f])
     for oc in ctx(f, m1[f]).ancestors():
-        ocr = oc.rev()
+        ocr = oc.linkrev()
         of = oc.path()
         if of in seen:
             # check limit late - grab last rename before