equal
deleted
inserted
replaced
958 % len(troubled)) |
958 % len(troubled)) |
959 return 2 |
959 return 2 |
960 else: |
960 else: |
961 ui.write_err(_('no troubled changeset\n')) |
961 ui.write_err(_('no troubled changeset\n')) |
962 return 1 |
962 return 1 |
|
963 repo = repo.unfiltered() |
|
964 tr = repo[tr.rev()] |
963 cmdutil.bailifchanged(repo) |
965 cmdutil.bailifchanged(repo) |
964 troubles = tr.troubles() |
966 troubles = tr.troubles() |
965 if 'unstable' in troubles: |
967 if 'unstable' in troubles: |
966 return _solveunstable(ui, repo, tr, opts['dry_run']) |
968 return _solveunstable(ui, repo, tr, opts['dry_run']) |
967 elif 'bumped' in troubles: |
969 elif 'bumped' in troubles: |