From: martin f krafft <madduck@madduck.net>
Date: Wed, 24 Sep 2008 11:21:15 GMT
Subject: Re: TopGit: how to deal with upstream inclusion
Message-ID: <20080924112115.GA14841@piper.oerlikon.madduck.net>
In-Reply-To: <20080923095528.GR10360@machine.or.cz>

also sprach Petr Baudis <pasky@suse.cz> [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?

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
the reason the mainstream is thought of as a stream
is because it is so shallow.
 
spamtraps: madduck.bogus@madduck.net