Mercurial > hg-stable

changeset 11515:cc982ff2dcf8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Robert Bauck Hamar <r.b.hamar@usit.uio.no>
date Wed, 07 Jul 2010 14:11:59 +0200
parents 0c944b7af564
children ee876e42dd74
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: