Mercurial > hg

changeset 12179:1447d3a9ff4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix ternary expression introduced in 1ef9b0b5efec
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 08 Sep 2010 15:16:03 +0200
parents 1ef9b0b5efec
children 45e654e10e1b
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Sep 08 13:48:25 2010 +0200
+++ b/mercurial/commands.py	Wed Sep 08 15:16:03 2010 +0200
@@ -338,7 +338,7 @@
             displayer.show(repo[nodes[0]])
             parents = repo[nodes[0]].parents()
             if len(parents) > 1:
-                side = state['bad'] if good else state['good']
+                side = good and state['bad'] or state['good']
                 num = len(set(i.node() for i in parents) & set(side))
                 if num == 1:
                     common = parents[0].ancestor(parents[1])