From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@inf.ethz.ch>, Git List <git@vger.kernel.org>,
Avery Pennarun <apenwarr@gmail.com>
Subject: Re: [PATCH] t4202 (log): add failing test for log with subtree
Date: Mon, 22 Apr 2013 23:30:21 +0530 [thread overview]
Message-ID: <CALkWK0madWxOSraZw6u8U_afVeK8tyMB_+D59n1vSBmobxGqqg@mail.gmail.com> (raw)
In-Reply-To: <7vk3nupltx.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> [...]
> (3) When (1) notices that the path being followed did not exist in
> any of the parents (be it a merge or a non-merge) and finds a
> different path with a similar looking content, it _switches_
> the pathspec to it, but the single pathspec it uses is a global
> state and affects traversals of other ancestry paths at the
> same time. Because of this, "--follow" will not work correctly
> in a history that contains merges. It often _appears_ to work
> only by accident.
This explanation is all very nice, but isn't it completely tangential
to the issue at hand?
Let's say I have a subtree merge M located at HEAD~4. I ask for the
log of 'HEAD~4 -- README' with --follow. It follows until it gets to
M: at M, M^1:README is missing, but M^2:README is present. Should it
follow down and show the history of M^2:README?
You can reserve the discussion about --follow working in the general
case for another thread. Meanwhile, you're evading the issue of
assuming that all trees are read into /, and are really representing
the same project's history, while this is not the case.
next prev parent reply other threads:[~2013-04-22 18:01 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 12:08 [PATCH] t4202 (log): add failing test for log with subtree Ramkumar Ramachandra
2013-04-22 12:11 ` Matthieu Moy
2013-04-22 12:17 ` Thomas Rast
2013-04-22 12:37 ` Ramkumar Ramachandra
2013-04-22 12:54 ` Ramkumar Ramachandra
2013-04-22 12:29 ` Ramkumar Ramachandra
2013-04-22 12:36 ` Matthieu Moy
2013-04-22 13:15 ` Thomas Rast
2013-04-22 13:19 ` Thomas Rast
2013-04-22 14:30 ` Ramkumar Ramachandra
2013-04-22 14:57 ` Ramkumar Ramachandra
2013-04-22 15:24 ` Thomas Rast
2013-04-22 15:46 ` Ramkumar Ramachandra
2013-04-22 15:50 ` Ramkumar Ramachandra
2013-04-22 15:54 ` Ramkumar Ramachandra
2013-04-22 17:29 ` Ramkumar Ramachandra
2013-04-22 19:15 ` Thomas Rast
2013-04-22 19:54 ` Ramkumar Ramachandra
2013-04-22 21:00 ` Philip Oakley
2013-04-22 21:08 ` Ramkumar Ramachandra
2013-04-22 21:23 ` Ramkumar Ramachandra
2013-04-22 21:06 ` Matthieu Moy
2013-04-22 21:59 ` Junio C Hamano
2013-04-22 22:52 ` Ramkumar Ramachandra
2013-04-22 22:59 ` Ramkumar Ramachandra
2013-04-22 23:55 ` Junio C Hamano
2013-04-23 7:53 ` Ramkumar Ramachandra
2013-04-23 16:03 ` Junio C Hamano
2013-04-23 16:29 ` Ramkumar Ramachandra
2013-04-22 16:32 ` Junio C Hamano
2013-04-22 18:00 ` Ramkumar Ramachandra [this message]
2013-04-22 18:18 ` Matthieu Moy
2013-04-22 19:09 ` Junio C Hamano
2013-04-22 20:39 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALkWK0madWxOSraZw6u8U_afVeK8tyMB_+D59n1vSBmobxGqqg@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).