--- a/hgext/rebase.py Tue Sep 18 23:29:05 2012 +0200
+++ b/hgext/rebase.py Tue Sep 18 23:32:42 2012 +0200
@@ -184,7 +184,8 @@
rebaseset = repo.revs(
'(children(ancestor(%ld, %d)) and ::(%ld))::',
base, dest, base)
-
+ # temporary top level filtering of extinct revisions
+ rebaseset = repo.revs('%ld - hidden()', rebaseset)
if rebaseset:
root = min(rebaseset)
else:
@@ -193,7 +194,7 @@
if not rebaseset:
repo.ui.debug('base is ancestor of destination\n')
result = None
- elif not keepf and repo.revs('first(children(%ld) - %ld)',
+ elif not keepf and repo.revs('first(children(%ld) - %ld)-hidden()',
rebaseset, rebaseset):
raise util.Abort(
_("can't remove original changesets with"