Patchwork D6235: copies: move comment about implementation of mergecopies() to end

login
register
mail settings
Submitter phabricator
Date April 13, 2019, 11:46 a.m.
Message ID <e330f0c4137fcc156297974d96df86a5@localhost.localdomain>
Download mbox | patch
Permalink /patch/39588/
State Not Applicable
Headers show

Comments

phabricator - April 13, 2019, 11:46 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG967c098eed33: copies: move comment about implementation of mergecopies() to end (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6235?vs=14728&id=14733

REVISION DETAIL
  https://phab.mercurial-scm.org/D6235

AFFECTED FILES
  mercurial/copies.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -430,8 +430,7 @@ 
 
 def mergecopies(repo, c1, c2, base):
     """
-    The function calling different copytracing algorithms on the basis of config
-    which find moves and copies between context c1 and c2 that are relevant for
+    Finds moves and copies between context c1 and c2 that are relevant for
     merging. 'base' will be used as the merge base.
 
     Copytracing is used in commands like rebase, merge, unshelve, etc to merge
@@ -472,6 +471,8 @@ 
     "dirmove" is a mapping of detected source dir -> destination dir renames.
     This is needed for handling changes to new files previously grafted into
     renamed directories.
+
+    This function calls different copytracing algorithms based on config.
     """
     # avoid silly behavior for update from empty dir
     if not c1 or not c2 or c1 == c2: