From: Petr Baudis Date: Sun, 21 Sep 2008 14:19:24 GMT Subject: Re: TopGit: how to deal with upstream inclusion Message-ID: <20080921141924.GI10360@machine.or.cz> In-Reply-To: <20080919170406.GA22849@lapse.rw.madduck.net> On Fri, Sep 19, 2008 at 06:04:06PM +0100, martin f krafft wrote: > also sprach Petr Baudis [2008.09.14.2203 +0100]: > > (iii) Merge in RETIRED head branch with -s ours > > Yes, it does. One might want to consider to make the use of -s ours > in (iiii) configurable, but otherwise that's it. That might be pretty dangerous, since then your topic branch will have outstanding branches of the retired branch, but they will _NOT_ be visible to tg patch and others since they will be in both the base and head. -- Petr "Pasky" Baudis The next generation of interesting software will be done on the Macintosh, not the IBM PC. -- Bill Gates