Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 11181:6e65b451b62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix complaint about branch merge creating new heads (issue2186)
author Matt Mackall <mpm@selenic.com>
date Sat, 15 May 2010 21:24:23 -0500
parents 4b02fc71bbba
children 6d7cf82453be
comparison
equal deleted inserted replaced
11180:4b02fc71bbba 11181:6e65b451b62e
764 return 1 764 return 1
765 765
766 ctx = repo[node] 766 ctx = repo[node]
767 parents = ctx.parents() 767 parents = ctx.parents()
768 768
769 if bheads and [x for x in parents if x.node() not in bheads]: 769 if bheads and [x for x in parents
770 if x.node() not in bheads and x.branch() == branch]:
770 ui.status(_('created new head\n')) 771 ui.status(_('created new head\n'))
771 772
772 if not opts.get('close_branch'): 773 if not opts.get('close_branch'):
773 for r in parents: 774 for r in parents:
774 if r.extra().get('close'): 775 if r.extra().get('close'):