Mercurial > hg
comparison mercurial/exchange.py @ 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 | 10841b9a80c3 |
children | e0bf41b83cef |
comparison
equal
deleted
inserted
replaced
42913:a8b249b2f8cc | 42914:08fce968d00b |
---|---|
728 | 728 |
729 comp = [hexifycompbookmarks(marks) for marks in comp] | 729 comp = [hexifycompbookmarks(marks) for marks in comp] |
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 |
739 repo = pushop.repo | 739 repo = pushop.repo |
740 | 740 |