diff --git a/lib/hgaster/hooks/generic.py b/lib/hgaster/hooks/generic.py index eff1d15cf0ddf9b8ae93f754c20d3b2b7fa49324..51761c052a7b715b5ba38fa4a0ebb01465230d4c 100644 --- a/lib/hgaster/hooks/generic.py +++ b/lib/hgaster/hooks/generic.py @@ -184,7 +184,8 @@ def single_head_per_branch_hook(in_branch=None): if node.branch() != branch or node.phase() == hg.phases.secret: continue unclosed = [head for head in heads - if not repo[head].extra().get("close")] + if not repo[head].extra().get("close") + and repo[head].phase() != hg.phases.secret] if len(unclosed) > 1: ui.warn("ERROR: Only one head per branch is allowed " "(problem on branch '{0}')!\n"