Re: TopGit: how to deal with upstream inclusion

From: martin f krafft <madduck@madduck.net>
Date: Sep 19, 2008, 17:04 UTC
Message-ID: <20080919170406.GA22849@lapse.rw.madduck.net>
In-Reply-To: <20080914210316.GJ10360@machine.or.cz>

also sprach Petr Baudis <pasky@suse.cz> [2008.09.14.2203 +0100]:

Show 21 quoted lines

> 	tg depend fold RETIRED VANILLA
> 
>   (i) Take the RETIRED _base_ branch
> 
>   (ii) Merge in VANILLA
> 
>   (iii) Merge in RETIRED head branch with -s ours
> 
>   (iv) Now we have a commit that contains RETIRED topic branch, but with
> the RETIRED's changes taken from VANILLA instead of RETIRED
> 
>   (v) Merge this into the base of your current branch
> 
>   (vi) Merge base to the head of your current branch, replacing RETIRED
> with VANILLA (if not already there) in the .topdeps
> 
>   (vii) You do not have to add VANILLA if you depend on it recursively
> and ran tg update before to get it from your dependencies
> 
>   Maybe in your case this could be even simpler but this should be the
> general process. Does that sound right?

Yes, it does. One might want to consider to make the use of -s ours in (iiii) configurable, but otherwise that's it.

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
all information contained in the above is false,
for reasons of military security.
 
spamtraps: madduck.bogus@madduck.net