[PATCH STABLE] log --follow shouldn't depend on the working dir context
Matt Mackall
mpm at selenic.com
Wed Jun 13 15:10:11 CDT 2012
On Mon, 2012-06-11 at 22:39 +0200, Christian Boos wrote:
> Hello,
>
> I noticed that the change 60101427d618 (released in Mercurial 2.1.1)
> introduced a check for "log --follow", verifying that the file examined
> is present in the parent context, so that revisions in the filelog
> can be followed from the appropriate starting point.
>
> See http://www.selenic.com/hg/rev/60101427d618 for details.
>
> This is all well and good except for the change's notion of parent
> context: it uses the working dir context for that!
Imprecise: it uses the '.' context, which is wctx.p1().
Which is probably wrong, even here. 'hg log --follow file' wants to
consult wctx, not wctx.p1()!
How '--follow' relates to '-r <not a single rev>' is pretty well into
undefined territory though. Not poking at the dirstate is probably
appropriate whenever -r is given though.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list