# HG changeset patch # User Matt Mackall # Date 1274386825 18000 # Node ID 54e93b86a9e3c2ae8d435dabd269875445e745f4 # Parent 7a9cf012dddce918220c75b2fade5f2f40f68525 rebase: improve --abort failure message diff -r 7a9cf012dddc -r 54e93b86a9e3 hgext/rebase.py --- a/hgext/rebase.py Thu May 20 15:15:11 2010 -0500 +++ b/hgext/rebase.py Thu May 20 15:20:25 2010 -0500 @@ -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 -r 7a9cf012dddc -r 54e93b86a9e3 tests/test-rebase-interruptions.out --- a/tests/test-rebase-interruptions.out Thu May 20 15:15:11 2010 -0500 +++ b/tests/test-rebase-interruptions.out Thu May 20 15:20:25 2010 -0500 @@ -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