##// END OF EJS Templates
copies: move comment about implementation of mergecopies() to end...
Martin von Zweigbergk -
r42287:967c098e default
parent child Browse files
Show More
@@ -430,8 +430,7 b' def _combinecopies(copyfrom, copyto, fin'
430
430
431 def mergecopies(repo, c1, c2, base):
431 def mergecopies(repo, c1, c2, base):
432 """
432 """
433 The function calling different copytracing algorithms on the basis of config
433 Finds moves and copies between context c1 and c2 that are relevant for
434 which find moves and copies between context c1 and c2 that are relevant for
435 merging. 'base' will be used as the merge base.
434 merging. 'base' will be used as the merge base.
436
435
437 Copytracing is used in commands like rebase, merge, unshelve, etc to merge
436 Copytracing is used in commands like rebase, merge, unshelve, etc to merge
@@ -472,6 +471,8 b' def mergecopies(repo, c1, c2, base):'
472 "dirmove" is a mapping of detected source dir -> destination dir renames.
471 "dirmove" is a mapping of detected source dir -> destination dir renames.
473 This is needed for handling changes to new files previously grafted into
472 This is needed for handling changes to new files previously grafted into
474 renamed directories.
473 renamed directories.
474
475 This function calls different copytracing algorithms based on config.
475 """
476 """
476 # avoid silly behavior for update from empty dir
477 # avoid silly behavior for update from empty dir
477 if not c1 or not c2 or c1 == c2:
478 if not c1 or not c2 or c1 == c2:
General Comments 0
You need to be logged in to leave comments. Login now