Re: The coolest merge EVER!

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Jun 24, 2005, 17:49 UTC
Message-ID: <Pine.LNX.4.21.0506241332150.30848-100000@iabervon.org>
In-Reply-To: <pan.2005.06.24.11.54.51.598627@smurf.noris.de>

On Fri, 24 Jun 2005, Matthias Urlichs wrote:

Show 8 quoted lines

> Hi, Junio C Hamano wrote:
> 
> > I suspect there
> > would be a massive additional support needed if you want to make it easy
> > for Paul to pull changes made to gitk in your tree.
> 
> I don't think that's possible; after all, the trees are now merged, so any
> pull would fetch all of Linus' tree.

Linus could do:

 git-read-tree gitk-head
 git-update-cache gitk
 git-commit-tree `write-tree` -p gitk-head > gitk-patched-head
 git-read-tree HEAD
 git merge gitk-patched-head

(or, better, use a separate index file for the gitk index)

(to commit changes to the gitk script made in a git working directory)

The change I proposed earlier would be so that the system would know what was going on and users wouldn't have to. Then someone who didn't know that gitk was (also) a separate project and just committed changes to it would still generate gitk commits when appropriate.

	-Daniel
*This .sig left intentionally blank*