On Tue, Jun 30, 2009 at 08:31:34PM +0200, Uwe Kleine-König wrote: > > My scenario is that I'm maintaining a topic branch against upstream which > > also > > uses git, for the sake of consistency I'm using topgit as that branch will > > probably go in debian/patches/ > > > > If I want to send the branch upstream for review I would like incremental > > patches as that is nicer on upstream, OTOH for debian packaging I'm > > exporting as > > a single patch. > Obviously you don't want to feed your complete patch upstream as is, OK.
exactly > But in general you want to squash more the one commit to get a nice > patch. Your approach only works if you did your patch right right from > the beginning. (Note: you could simply use git-format-patch for that.) Not necessarily, if I know the branch is for upstream consumption I can rework the history to be clean. Anyhow, and that's the whole point, I can't use git format-patch on a topgit branch unless I remember to manually exclude .topgit and .topdeps, otherwise upstream will get those as well. > I assume you don't mean with incremental that you only send the new > changes if you send an updated patch, do you? correct [omitting the rest, but thanks for the suggestion] filippo -- Filippo Giunchedi - http://esaurito.net - 0x6B79D401 It's not that I'm afraid to die, I just don't want to be there when it happens. -- Woody Allen -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
