diff --git a/hgext/rebase.py b/hgext/rebase.py index 7a9cf012dddce918220c75b2fade5f2f40f68525_aGdleHQvcmViYXNlLnB5..54e93b86a9e3c2ae8d435dabd269875445e745f4_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -427,7 +427,7 @@ 'Restore the repository to its original state' if set(repo.changelog.descendants(target)) - set(state.values()): repo.ui.warn(_("warning: new changesets detected on target branch, " - "not stripping\n")) + "can't abort\n")) else: # Strip from the first rebased revision merge.update(repo, repo[originalwd].rev(), False, True, False) diff --git a/tests/test-rebase-interruptions.out b/tests/test-rebase-interruptions.out index 7a9cf012dddce918220c75b2fade5f2f40f68525_dGVzdHMvdGVzdC1yZWJhc2UtaW50ZXJydXB0aW9ucy5vdXQ=..54e93b86a9e3c2ae8d435dabd269875445e745f4_dGVzdHMvdGVzdC1yZWJhc2UtaW50ZXJydXB0aW9ucy5vdXQ= 100644 --- a/tests/test-rebase-interruptions.out +++ b/tests/test-rebase-interruptions.out @@ -95,7 +95,7 @@ % Abort the rebasing -warning: new changesets detected on target branch, not stripping +warning: new changesets detected on target branch, can't abort @ 6: Extra | o 5: B