equal
deleted
inserted
replaced
1944 except MergeFailure: |
1944 except MergeFailure: |
1945 _evolvestatewrite(repo, {'current': orig.node()}) |
1945 _evolvestatewrite(repo, {'current': orig.node()}) |
1946 repo.ui.write_err(_('evolve failed!\n')) |
1946 repo.ui.write_err(_('evolve failed!\n')) |
1947 repo.ui.write_err( |
1947 repo.ui.write_err( |
1948 _('fix conflict and run "hg evolve --continue"' |
1948 _('fix conflict and run "hg evolve --continue"' |
1949 ' or use "hg update -C" to abort\n')) |
1949 ' or use "hg update -C ." to abort\n')) |
1950 raise |
1950 raise |
1951 |
1951 |
1952 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False, |
1952 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False, |
1953 progresscb=None): |
1953 progresscb=None): |
1954 """Stabilize a bumped changeset""" |
1954 """Stabilize a bumped changeset""" |