Re: [boost] torvalds on branching/merging (was Boost Development Environment proposal)

From: Henrik Sundberg (storangen_at_[hidden])
Date: 2007-06-07 16:02:56

2007/6/7, Phil Richards <news_at_[hidden]>:
> On Thu, 07 Jun 2007 10:21:10 -0400, David Abrahams wrote:
> > Yeah; I get the impression that GIT even deals correctly with fragments
> > of code moving across files.
>
> I believe that that impression is incorrect.  Because GIT tracks file
> state only (no explicit rename or copy tracking), it use a similarity
> comparison between states to try and identify when a rename actually
> occurred so it can track the "history" of content.  If a fragment is
> moved, the similarity check will not identify that fragment.  The two
> files will end up being viewed as completely independent by all parts of
> GIT including the merge algorithms.

I got the same impression as David. This was highlighted as something
special to GIT.
/$