Re: [ANNOUNCE] Example Cogito Addon - cogito-bundle
- From
Linus Torvalds <torvalds@osdl.org>
- Date
- Oct 20, 2006, 18:06 UTC
- Message-ID
- <Pine.LNX.4.64.0610201100070.3962@g5.osdl.org>
- In-Reply-To
- <45390BAF.5040405@utoronto.ca>
On Fri, 20 Oct 2006, Aaron Bentley wrote:
Show 5 quoted lines
> > > > Git _definitely_ handles renames, both in everyday life and when merging. > > Hmm. Could you say more here? The only examples I can think of for > handling renames are situations that can be expressed as a merge.
So yes, merges are the situation where renames are normally considered a "problem", but it's actually not nearly the most every-day situation at all.
The most common one is actually just showing things as a diff.
If you are looking at a code-change, there's an absolutely _huge_ difference if you look at the result as a "delete this huge file" and "create this other huge file" and seeing it as a "move this huge file from here to here, and change a few lines in the process".
So the most _important_ part of rename tracking from a user perspective is for the person who walks through somebody elses code history, and wants to know how a certain state came to be. The merges are usually not as big of a deal for the user (although they are clearly the most hairy case for the SCM - which is why SCM people concentrate on merges).
Linus