Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 11201:34023f2ca305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up rebase's handling of strip backups
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 12:21:35 -0500
parents 3ef2572de32f
children 7a9cf012dddc
line wrap: on
line diff
--- a/hgext/rebase.py	Thu May 20 12:15:44 2010 -0500
+++ b/hgext/rebase.py	Thu May 20 12:21:35 2010 -0500
@@ -208,7 +208,8 @@
                     ui.warn(_("warning: new changesets detected "
                               "on source branch, not stripping\n"))
                 else:
-                    repair.strip(ui, repo, repo[min(rebased)].node(), "strip")
+                    # backup the old csets by default
+                    repair.strip(ui, repo, repo[min(rebased)].node(), "all")
 
         clearstatus(repo)
         ui.status(_("rebase completed\n"))
@@ -433,7 +434,8 @@
         rebased = filter(lambda x: x > -1, state.values())
         if rebased:
             strippoint = min(rebased)
-            repair.strip(repo.ui, repo, repo[strippoint].node(), "strip")
+            # no backup of rebased cset versions needed
+            repair.strip(repo.ui, repo, repo[strippoint].node())
         clearstatus(repo)
         repo.ui.status(_('rebase aborted\n'))