##// END OF EJS Templates
doc: fix up confusing doc comment...
Valentin Gatien-Baron -
r43184:08fce968 default
parent child Browse files
Show More
@@ -480,8 +480,7 b' def comparebookmarks(repo, srcmarks, dst'
480
480
481 Each elements of lists in result tuple is tuple "(bookmark name,
481 Each elements of lists in result tuple is tuple "(bookmark name,
482 changeset ID on source side, changeset ID on destination
482 changeset ID on source side, changeset ID on destination
483 side)". Each changeset IDs are 40 hexadecimal digit string or
483 side)". Each changeset ID is a binary node or None.
484 None.
485
484
486 Changeset IDs of tuples in "addsrc", "adddst", "differ" or
485 Changeset IDs of tuples in "addsrc", "adddst", "differ" or
487 "invalid" list may be unknown for repo.
486 "invalid" list may be unknown for repo.
@@ -730,9 +730,9 b' def _pushdiscoverybookmarks(pushop):'
730 return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)
730 return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)
731
731
732 def _processcompared(pushop, pushed, explicit, remotebms, comp):
732 def _processcompared(pushop, pushed, explicit, remotebms, comp):
733 """take decision on bookmark to pull from the remote bookmark
733 """take decision on bookmarks to push to the remote repo
734
734
735 Exist to help extensions who want to alter this behavior.
735 Exists to help extensions alter this behavior.
736 """
736 """
737 addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
737 addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
738
738
General Comments 0
You need to be logged in to leave comments. Login now