# HG changeset patch # User Valentin Gatien-Baron # Date 2019-09-09 00:09:31 # Node ID 08fce968d00bf9ee976e2f83b31c6d6149412d1c # Parent a8b249b2f8cc599d405b299a2dcf7a294fd14b3f doc: fix up confusing doc comment Differential Revision: https://phab.mercurial-scm.org/D6829 diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -480,8 +480,7 @@ def comparebookmarks(repo, srcmarks, dst Each elements of lists in result tuple is tuple "(bookmark name, changeset ID on source side, changeset ID on destination - side)". Each changeset IDs are 40 hexadecimal digit string or - None. + side)". Each changeset ID is a binary node or None. Changeset IDs of tuples in "addsrc", "adddst", "differ" or "invalid" list may be unknown for repo. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -730,9 +730,9 @@ def _pushdiscoverybookmarks(pushop): return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) def _processcompared(pushop, pushed, explicit, remotebms, comp): - """take decision on bookmark to pull from the remote bookmark + """take decision on bookmarks to push to the remote repo - Exist to help extensions who want to alter this behavior. + Exists to help extensions alter this behavior. """ addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp