changeset 22952 | 8792ac090e3b |
parent 22951 | 6c86c673dde6 |
child 23072 | d583f1cfca96 |
--- a/hgext/rebase.py Tue Oct 14 13:23:52 2014 -0700 +++ b/hgext/rebase.py Tue Oct 14 13:25:13 2014 -0700 @@ -303,7 +303,8 @@ ('+'.join(str(repo[r]) for r in base), dest)) return 1 - if (not (keepf or obsolete._enabled) + allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) + if (not (keepf or allowunstable) and repo.revs('first(children(%ld) - %ld)', rebaseset, rebaseset)): raise util.Abort(