Re: TopGit: how to deal with upstream inclusion

From: Petr Baudis <pasky@suse.cz>
Date: Sep 23, 2008, 09:55 UTC
Message-ID: <20080923095528.GR10360@machine.or.cz>
In-Reply-To: <20080923063550.GC19084@piper.oerlikon.madduck.net>

On Tue, Sep 23, 2008 at 08:35:50AM +0200, martin f krafft wrote:

Show 12 quoted lines

> also sprach Petr Baudis <pasky@suse.cz> [2008.09.21.1619 +0200]:
> > > 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.
> 
> 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.

				Petr "Pasky" Baudis