Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 11316:7fa3968004c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: --abort doesn't strip away the target changeset (issue2220) When a changeset is skipped, rebase keeps the previous target as next target and if the skipped cset is the first one, the recorded target is actually the original target. --abort did not detect this situation but simply stripped away the cset.
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Tue, 08 Jun 2010 18:01:07 +0200
parents f118029e534c
children 40c06bbf58be
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Jun 09 17:22:59 2010 +0200
+++ b/hgext/rebase.py	Tue Jun 08 18:01:07 2010 +0200
@@ -427,7 +427,7 @@
     else:
         # Strip from the first rebased revision
         merge.update(repo, repo[originalwd].rev(), False, True, False)
-        rebased = filter(lambda x: x > -1, state.values())
+        rebased = filter(lambda x: x > -1 and x != target, state.values())
         if rebased:
             strippoint = min(rebased)
             # no backup of rebased cset versions needed