Show More
@@ -5074,11 +5074,10 b' def push(ui, repo, dest=None, **opts):' | |||
|
5074 | 5074 | |
|
5075 | 5075 | result = not pushop.cgresult |
|
5076 | 5076 | |
|
5077 | if opts.get('bookmark'): | |
|
5078 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) | |
|
5079 | if bresult == 2: | |
|
5077 | if pushop.bkresult is not None: | |
|
5078 | if pushop.bkresult == 2: | |
|
5080 | 5079 | result = 2 |
|
5081 | elif not result and bresult: | |
|
5080 | elif not result and pushop.bkresult: | |
|
5082 | 5081 | result = 2 |
|
5083 | 5082 | |
|
5084 | 5083 | return result |
@@ -216,6 +216,10 b' def push(repo, remote, force=False, revs' | |||
|
216 | 216 | if locallock is not None: |
|
217 | 217 | locallock.release() |
|
218 | 218 | |
|
219 | if pushop.bookmarks: | |
|
220 | pushop.bkresult = bookmod.pushtoremote(repo.ui, repo, remote, | |
|
221 | pushop.bookmarks) | |
|
222 | ||
|
219 | 223 | return pushop |
|
220 | 224 | |
|
221 | 225 | # list of steps to perform discovery before push |
General Comments 0
You need to be logged in to leave comments.
Login now