Re: LCA2006 Git/Cogito tutorial

From: Junio C Hamano <junkio@cox.net>
Date: Oct 24, 2005, 09:44 UTC
Message-ID: <7v3bmrqmf6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051024075431.GY30889@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 11 quoted lines

> Dear diary, on Mon, Oct 24, 2005 at 03:35:43AM CEST, I got a letter
> where Linus Torvalds <torvalds@osdl.org> told me that...
>> Oh, the git merge is about a million times better than any silly weave 
>> merge with extra BonusPoints and MagicCapitalizedNames.
>> 
>> Why? Because if you want to be slow and careful, you can always just 
>> create the weave after-the-fact and do a weave merge.
>
> This doesn't make sense. Those silly weave merges only describe what to
> do with the weave to do the merge, not how you got the weave in the
> first place.

True, but it should not be a problem that is made harder for you to solve by the fact that our repository is not based on weaves.

Unless an weave-based SCM comes with an integrated editor that records line insertion and deletion user actions and forces users to use that editor and nothing else, it also has to work on two whole files (pre- and post-modification) in order to find the matching lines and figure out the weave to record, on top of the history before pre-modification image. I think you have the same information as they have to create the weave after the fact for each commit in that sense.