Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 14874:d7b424a03627

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: suppress spurious new head message for duplicate commit (issue2893)
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Jul 2011 16:43:18 -0500
parents 4731d61cd36b
children 7c3c8f37e84f
comparison
equal deleted inserted replaced
14873:f79d47813b8b 14874:d7b424a03627
1103 return 1 1103 return 1
1104 1104
1105 ctx = repo[node] 1105 ctx = repo[node]
1106 parents = ctx.parents() 1106 parents = ctx.parents()
1107 1107
1108 if bheads and not [x for x in parents 1108 if (bheads and node not in bheads and not
1109 if x.node() in bheads and x.branch() == branch]: 1109 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1110 ui.status(_('created new head\n')) 1110 ui.status(_('created new head\n'))
1111 # The message is not printed for initial roots. For the other 1111 # The message is not printed for initial roots. For the other
1112 # changesets, it is printed in the following situations: 1112 # changesets, it is printed in the following situations:
1113 # 1113 #
1114 # Par column: for the 2 parents with ... 1114 # Par column: for the 2 parents with ...