Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/commands.py @ 3622:535da78ae47b
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 07 Nov 2006 22:18:34 +0100 |
parents | 8c4fd0de5de8 |
children | 44e75d9fa654 |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -324,12 +324,13 @@ class changeset_printer(object): parents = log.parentrevs(rev) if not self.ui.debugflag: - parents = [p for p in parents if p != nullrev] - if len(parents) == 1 and parents[0] == rev-1: - parents = [] + if parents[1] == nullrev: + if parents[0] >= rev - 1: + parents = [] + else: + parents = [parents[0]] parents = [(p, hexfunc(log.node(p))) for p in parents] - self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) if branch: