D6829: doc: fix up confusing doc comment
valentin.gatienbaron (Valentin Gatien-Baron)
phabricator at mercurial-scm.org
Mon Sep 9 16:10:15 UTC 2019
Closed by commit rHG08fce968d00b: doc: fix up confusing doc comment (authored by valentin.gatienbaron).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6829?vs=16450&id=16465
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6829/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6829
AFFECTED FILES
mercurial/bookmarks.py
mercurial/exchange.py
CHANGE DETAILS
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -730,9 +730,9 @@
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
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -480,8 +480,7 @@
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.
To: valentin.gatienbaron, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list