Re: Merge with git-pasky II.

From: Linus Torvalds <torvalds@osdl.org>
Date: Apr 26, 2005, 19:58 UTC
Message-ID: <Pine.LNX.4.58.0504261256150.18901@ppc970.osdl.org>
In-Reply-To: <Pine.LNX.4.44.0504261129500.4678-100000@wax.eds.org>

On Tue, 26 Apr 2005, Bram Cohen wrote:

> 
> If one person renames a file and another person modifies it then the
> changes should be applied to the moved file.

Bzzt. Wrong answer.

The _right_ answer is "if one person moves a function, and another person modifies the function, the changes should be applied to the moved function".

Which is clearly a _much_ more common case than file renames.

In other words, if your algorithm doesn't handle the latter, then there is no point in handling the former either.

And _if_ your algorithm handles the latter, then there's no point in handling file renames specially, since the algorithm will have done that too, as a small part of it.

		Linus