Show More
@@ -295,7 +295,7 b' def _pushdiscoverybookmarks(pushop):' | |||||
295 | remotebookmark = remote.listkeys('bookmarks') |
|
295 | remotebookmark = remote.listkeys('bookmarks') | |
296 |
|
296 | |||
297 | comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) |
|
297 | comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) | |
298 |
|
|
298 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp | |
299 | for b, scid, dcid in advsrc: |
|
299 | for b, scid, dcid in advsrc: | |
300 | if not ancestors or repo[scid].rev() in ancestors: |
|
300 | if not ancestors or repo[scid].rev() in ancestors: | |
301 | pushop.outbookmarks.append((b, dcid, scid)) |
|
301 | pushop.outbookmarks.append((b, dcid, scid)) |
General Comments 0
You need to be logged in to leave comments.
Login now