author | Thomas Arendsen Hein <thomas@intevation.de> |
Tue, 21 Feb 2006 15:37:23 +0100 | |
changeset 1764 | 4671078dbfe7 |
parent 1763 | fa34a74efc40 |
child 1765 | b9fac31f34c9 |
--- a/mercurial/commands.py Tue Feb 21 13:14:03 2006 +0100 +++ b/mercurial/commands.py Tue Feb 21 15:37:23 2006 +0100 @@ -1637,7 +1637,6 @@ if opts['only_merges'] and len(parents) != 2: continue - br = None if opts['keyword']: changes = getchange(rev) miss = 0 @@ -1650,6 +1649,7 @@ if miss: continue + br = None if opts['branches']: br = repo.branchlookup([repo.changelog.node(rev)])