merge with mpm.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Thu, 06 Jul 2006 15:04:10 -0700
changeset 2574 78c2903fcabe
parent 2572 b13a98bd078e (current diff)
parent 2573 82e3b2966862 (diff)
child 2575 7289d20b18cd
merge with mpm.
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))