Re: Merge with git-pasky II.

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Apr 26, 2005, 20:31 UTC
Message-ID: <Pine.LNX.4.21.0504261607310.30848-100000@iabervon.org>
In-Reply-To: <Pine.LNX.4.58.0504261256150.18901@ppc970.osdl.org>

On Tue, 26 Apr 2005, Linus Torvalds wrote:

Show 12 quoted lines

> 
> 
> 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".

I'd even go so far as to say that we need to have the user sign off on this. The modification is reasonably likely to not work in the new location, due to use of statics that aren't available or something of the sort.

I suspect that we want to report a conflict in the new location between the old version and the new version, and let the person merging check whether the change is okay. That is, both sides modified the same section at the same time: one side modified its content, while the other modified its location. We can give a good suggestion, but we need a final ruling.

	-Daniel
*This .sig left intentionally blank*