equal
deleted
inserted
replaced
155 try: |
155 try: |
156 newid = relocate(repo, orig, target, pctx, keepbranch) |
156 newid = relocate(repo, orig, target, pctx, keepbranch) |
157 return (True, newid) |
157 return (True, newid) |
158 except MergeFailure: |
158 except MergeFailure: |
159 ops = {'current': orig.node()} |
159 ops = {'current': orig.node()} |
160 evolvestate = state.cmdstate(repo, opts=ops) |
160 evolvestate.addopts(ops) |
161 evolvestate.save() |
161 evolvestate.save() |
162 repo.ui.write_err(_('evolve failed!\n')) |
162 repo.ui.write_err(_('evolve failed!\n')) |
163 repo.ui.write_err( |
163 repo.ui.write_err( |
164 _("fix conflict and run 'hg evolve --continue'" |
164 _("fix conflict and run 'hg evolve --continue'" |
165 " or use 'hg update -C .' to abort\n")) |
165 " or use 'hg update -C .' to abort\n")) |