equal
deleted
inserted
replaced
1374 if not ui.quiet or confirm: |
1374 if not ui.quiet or confirm: |
1375 repo.ui.write(_('move:')) |
1375 repo.ui.write(_('move:')) |
1376 displayer.show(orig) |
1376 displayer.show(orig) |
1377 repo.ui.write(_('atop:')) |
1377 repo.ui.write(_('atop:')) |
1378 displayer.show(target) |
1378 displayer.show(target) |
1379 if confirm and ui.prompt('perform evolve? [Ny]') != 'y': |
1379 if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y': |
1380 raise util.Abort(_('evolve aborted by user')) |
1380 raise util.Abort(_('evolve aborted by user')) |
1381 if progresscb: progresscb() |
1381 if progresscb: progresscb() |
1382 todo = 'hg rebase -r %s -d %s\n' % (orig, target) |
1382 todo = 'hg rebase -r %s -d %s\n' % (orig, target) |
1383 if dryrun: |
1383 if dryrun: |
1384 repo.ui.write(todo) |
1384 repo.ui.write(todo) |
1412 if not ui.quiet or confirm: |
1412 if not ui.quiet or confirm: |
1413 repo.ui.write(_('recreate:')) |
1413 repo.ui.write(_('recreate:')) |
1414 displayer.show(bumped) |
1414 displayer.show(bumped) |
1415 repo.ui.write(_('atop:')) |
1415 repo.ui.write(_('atop:')) |
1416 displayer.show(prec) |
1416 displayer.show(prec) |
1417 if confirm and ui.prompt('perform evolve? [Ny]') != 'y': |
1417 if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y': |
1418 raise util.Abort(_('evolve aborted by user')) |
1418 raise util.Abort(_('evolve aborted by user')) |
1419 if dryrun: |
1419 if dryrun: |
1420 todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1()) |
1420 todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1()) |
1421 repo.ui.write(todo) |
1421 repo.ui.write(todo) |
1422 repo.ui.write('hg update %s;\n' % prec) |
1422 repo.ui.write('hg update %s;\n' % prec) |
1542 displayer.show(divergent) |
1542 displayer.show(divergent) |
1543 ui.write(_('with: ')) |
1543 ui.write(_('with: ')) |
1544 displayer.show(other) |
1544 displayer.show(other) |
1545 ui.write(_('base: ')) |
1545 ui.write(_('base: ')) |
1546 displayer.show(base) |
1546 displayer.show(base) |
1547 if confirm and ui.prompt('perform evolve? [Ny]') != 'y': |
1547 if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y': |
1548 raise util.Abort(_('evolve aborted by user')) |
1548 raise util.Abort(_('evolve aborted by user')) |
1549 if dryrun: |
1549 if dryrun: |
1550 ui.write('hg update -c %s &&\n' % divergent) |
1550 ui.write('hg update -c %s &&\n' % divergent) |
1551 ui.write('hg merge %s &&\n' % other) |
1551 ui.write('hg merge %s &&\n' % other) |
1552 ui.write('hg commit -m "auto merge resolving conflict between ' |
1552 ui.write('hg commit -m "auto merge resolving conflict between ' |