changeset 11316 | 7fa3968004c1 |
parent 11285 | f118029e534c |
child 11321 | 40c06bbf58be |
--- 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