Re: TopGit: how to deal with upstream inclusion

From: martin f krafft <madduck@madduck.net>
Date: Sep 23, 2008, 06:35 UTC
Message-ID: <20080923063550.GC19084@piper.oerlikon.madduck.net>
In-Reply-To: <20080921141924.GI10360@machine.or.cz>

also sprach Petr Baudis <pasky@suse.cz> [2008.09.21.1619 +0200]:

Show 7 quoted lines

> > 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?

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
"on the other hand, with the advent of msvc 5, i can claim i use
 emacs because it's smaller and more efficient." :-)"
                                                    -- darin johnson
 
spamtraps: madduck.bogus@madduck.net