Mercurial > public > mercurial-scm > hg
diff hgext/histedit.py @ 17761:c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
We do not want hidden revision to block histedit. They are already "dead"
and we do not care about dead orphans. see similar changeset 9e2dc0d292cd for
rebase.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 27 Sep 2012 14:00:52 +0200 |
| parents | 1b8e820ef19d |
| children | 57f27cbfc5bb |
line wrap: on
line diff
--- a/hgext/histedit.py Wed Oct 10 06:27:06 2012 +0200 +++ b/hgext/histedit.py Thu Sep 27 14:00:52 2012 +0200 @@ -588,7 +588,7 @@ When keep is false, the specified set can't have children.""" revs = list(repo.set('%n::%n', old, new)) - if not keep and repo.revs('(%ld::) - %ld', revs, revs): + if not keep and repo.revs('(%ld::) - (%ld + hidden())', revs, revs): raise util.Abort(_('cannot edit history that would orphan nodes')) return [c.node() for c in revs]