equal
deleted
inserted
replaced
4267 if optupdate: |
4267 if optupdate: |
4268 movemarkfrom = repo['.'].node() |
4268 movemarkfrom = repo['.'].node() |
4269 try: |
4269 try: |
4270 ret = hg.update(repo, checkout) |
4270 ret = hg.update(repo, checkout) |
4271 except util.Abort, inst: |
4271 except util.Abort, inst: |
4272 ui.warn(_("not updating: %s\n" % str(inst))) |
4272 ui.warn(_("not updating: %s\n") % str(inst)) |
4273 return 0 |
4273 return 0 |
4274 if not ret and not checkout: |
4274 if not ret and not checkout: |
4275 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
4275 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
4276 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
4276 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
4277 return ret |
4277 return ret |