Mercurial > hg

diff mercurial/copies.py @ 16169:c12d4aceba79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: remove checkdirs options This removes the undocumented merge.followdirs option, which has always been true.
author Matt Mackall <mpm@selenic.com>
date Sat, 25 Feb 2012 14:22:58 -0600
parents 7bbabfe25321
children b8c1a8a57540
line wrap: on
line diff
--- a/mercurial/copies.py	Fri Feb 24 18:21:06 2012 -0600
+++ b/mercurial/copies.py	Sat Feb 25 14:22:58 2012 -0600
@@ -174,7 +174,7 @@
         return _backwardcopies(x, y)
     return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y))
 
-def mergecopies(repo, c1, c2, ca, checkdirs=True):
+def mergecopies(repo, c1, c2, ca):
     """
     Find moves and copies between context c1 and c2 that are relevant
     for merging.
@@ -310,7 +310,7 @@
             repo.ui.debug("   %s -> %s %s\n" % (f, fullcopy[f], note))
     del diverge2
 
-    if not fullcopy or not checkdirs:
+    if not fullcopy:
         return copy, diverge
 
     repo.ui.debug("  checking for directory renames\n")