# HG changeset patch # User Vadim Gelfer # Date 1152223450 25200 # Node ID 78c2903fcabee7e7b30a8c02e0e1469e0f43e5c8 # Parent b13a98bd078ed591578d6cf374c7285369ae0b1c# Parent 82e3b2966862b0ad28b0d49ece7b2a6312242ee6 merge with mpm. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -765,7 +765,7 @@ def annotate(ui, repo, *pats, **opts): ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0]) - for src, abs, rel, exact in walk(repo, pats, opts, node=node): + for src, abs, rel, exact in walk(repo, pats, opts, node=ctx.node()): fctx = ctx.filectx(abs) if not opts['text'] and util.binary(fctx.data()): ui.write(_("%s: binary file\n") % ((pats and rel) or abs))