commands: only warn when reopening the workdir's branch
When commiting, a check is made to see if one of the parents is a
closed head. However this did not check that the branch of the commit
is the same as the closed head, so one could get a warning message on
the sequence
hg commit --close-branch
hg branch new-branch
hg commit
or when merging in a closed head.
--- a/mercurial/commands.py Sun Mar 28 15:23:11 2010 +0900
+++ b/mercurial/commands.py Wed Jul 07 14:11:59 2010 +0200
@@ -803,7 +803,7 @@
if not opts.get('close_branch'):
for r in parents:
- if r.extra().get('close'):
+ if r.extra().get('close') and r.branch() == branch:
ui.status(_('reopening closed branch head %d\n') % r)
if ui.debugflag: