Mercurial > hg
changeset 11204:54e93b86a9e3
rebase: improve --abort failure message
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 20 May 2010 15:20:25 -0500 |
| parents | 7a9cf012dddc |
| children | d26f662bfbf5 |
| files | hgext/rebase.py tests/test-rebase-interruptions.out |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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