changeset 30025 | 4d9999e43ff7 |
parent 29970 | 5ad164698626 |
child 30262 | bc5d0e6fd9f3 |
--- a/hgext/histedit.py Tue Sep 13 22:58:12 2016 -0400 +++ b/hgext/histedit.py Tue Sep 27 22:09:28 2016 -0700 @@ -1572,8 +1572,7 @@ state.read() histedit_nodes = set([action.node for action in state.actions if action.node]) - strip_nodes = set([repo[n].node() for n in nodelist]) - common_nodes = histedit_nodes & strip_nodes + common_nodes = histedit_nodes & set(nodelist) if common_nodes: raise error.Abort(_("histedit in progress, can't strip %s") % ', '.join(node.short(x) for x in common_nodes))