equal
deleted
inserted
replaced
5194 movemarkfrom = None |
5194 movemarkfrom = None |
5195 if not checkout: |
5195 if not checkout: |
5196 updata = destutil.destupdate(repo) |
5196 updata = destutil.destupdate(repo) |
5197 checkout, movemarkfrom, brev = updata |
5197 checkout, movemarkfrom, brev = updata |
5198 ret = hg.update(repo, checkout) |
5198 ret = hg.update(repo, checkout) |
5199 except error.Abort as inst: |
5199 except error.UpdateAbort as inst: |
5200 ui.warn(_("not updating: %s\n") % str(inst)) |
5200 ui.warn(_("not updating: %s\n") % str(inst)) |
5201 if inst.hint: |
5201 if inst.hint: |
5202 ui.warn(_("(%s)\n") % inst.hint) |
5202 ui.warn(_("(%s)\n") % inst.hint) |
5203 return 0 |
5203 return 0 |
5204 if not ret and not checkout: |
5204 if not ret and not checkout: |