Show More
@@ -5185,8 +5185,12 b' def postincoming(ui, repo, modheads, opt' | |||||
5185 | if modheads == 0: |
|
5185 | if modheads == 0: | |
5186 | return |
|
5186 | return | |
5187 | if optupdate: |
|
5187 | if optupdate: | |
5188 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) |
|
|||
5189 | try: |
|
5188 | try: | |
|
5189 | brev = checkout | |||
|
5190 | movemarkfrom = None | |||
|
5191 | if not checkout: | |||
|
5192 | updata = destutil.destupdate(repo) | |||
|
5193 | checkout, movemarkfrom, brev = updata | |||
5190 | ret = hg.update(repo, checkout) |
|
5194 | ret = hg.update(repo, checkout) | |
5191 | except error.Abort as inst: |
|
5195 | except error.Abort as inst: | |
5192 | ui.warn(_("not updating: %s\n") % str(inst)) |
|
5196 | ui.warn(_("not updating: %s\n") % str(inst)) |
General Comments 0
You need to be logged in to leave comments.
Login now