Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve --abort failure message
authorMatt Mackall <mpm@selenic.com>
Thu, 20 May 2010 15:20:25 -0500
changeset 11204 54e93b86a9e3
parent 11203 7a9cf012dddc
child 11205 d26f662bfbf5
rebase: improve --abort failure message
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-interruptions.out file | annotate | diff | comparison | revisions 
--- 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
Mercurial