From: Petr Baudis Date: Wed, 24 Sep 2008 15:29:13 GMT Subject: Re: TopGit: how to deal with upstream inclusion Message-ID: <20080924152913.GY10360@machine.or.cz> In-Reply-To: <20080924112115.GA14841@piper.oerlikon.madduck.net> On Wed, Sep 24, 2008 at 01:21:15PM +0200, martin f krafft wrote: > also sprach Petr Baudis [2008.09.23.1155 +0200]: > > > Well, but what if upstream implemented our solution slightly > > > differently, and if it's only because they used tabs instead of > > > spaces? We wouldn't want -s ours then, huh? > > > > You still would want to get tabs in other patches that depended on > > the merged one, no? Otherwise tg patch output will produce patches > > that do not apply and tg export will change the tabs back to > > spaces. > > I would want to have to resolve all dependent branches and change > them to use tabs, right. But since I used spaces and they used tabs, > using -s ours would give preference to spaces, no? Please read again carefully :-) : > (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 -s ours keeps vanilla version. -- Petr "Pasky" Baudis People who take cold baths never have rheumatism, but they have cold baths.