Re: Moved files and merges

From: Sam Ravnborg <sam@ravnborg.org>
Date: Sep 3, 2005, 19:05 UTC
Message-ID: <20050903190500.GB8379@mars.ravnborg.org>
In-Reply-To: <7vy86erntu.fsf@assigned-by-dhcp.cox.net>

On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote:

Show 10 quoted lines

> This is a simplified scenario of klibc vs klibc-kbuild HPA had
> trouble with, to help us think of a way to solve this
> interesting merge problem.
> 
> 	 #1 - #3 - #5 - #7
>        /    /         /
>     #0 - #2 - #4 - #6
> 
> There are two lines of developments.  #0->#2 renames F to G and
> introduces K.  #0->#1 keeps F as F and does not introduce K.

As explained in another mail what we want to do is actually to transpose the changes made to F to the now renamed file G. So we end up with G containing the modifications made to F.

Also we want to include the new file K.

So we end up with a new commit containing the renamed file with modifications and the new files too.

I hope this simplfies the usecase from a git perspective.

Sam