Mercurial > hg
changeset 42914:08fce968d00b
doc: fix up confusing doc comment
Differential Revision: https://phab.mercurial-scm.org/D6829
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sun, 08 Sep 2019 20:09:31 -0400 |
| parents | a8b249b2f8cc |
| children | 96b22e58dc67 |
| files | mercurial/bookmarks.py mercurial/exchange.py |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Fri Sep 06 23:15:52 2019 -0700 +++ b/mercurial/bookmarks.py Sun Sep 08 20:09:31 2019 -0400 @@ -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.
--- a/mercurial/exchange.py Fri Sep 06 23:15:52 2019 -0700 +++ b/mercurial/exchange.py Sun Sep 08 20:09:31 2019 -0400 @@ -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