On Tue, Jun 30, 2009 at 09:36:20AM +0200, Uwe Kleine-König wrote: > > However when sending them upstream it would be nice to be able to send > > the full history as git format-patch would do but excluding .topdeps and > > .topmsg (or using it as basis for --cover-letter), IOW have tg patch > > accept an option to behave like format-patch but output the full history > I don't understand what exactly you want. Incremental patches? I think > this won't work in general because the history typically contains merges > that are not representable by a patch. Hm, you could leave out the > merges. But then they might not apply cleanly to upstream's tree.
In general you are right, merges could be a problem > Do you really consider the intermediate steps interesting? IMHO a topic > branch is a unit and if it's sensible to send in in (say) three mails > then the patch should better be seperated into three patches/topic > branches. disclaimer: note that I might be missing something as I'm using topgit since some weeks and topgit might not the best tool for the scenario below > Maybe you could present an example where you can show that having the > full history is sensible? 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. So far so good, the problem is that sending upstream incremental patches from topgit as you would normally do with git format-patch you have to exclude .topmsg and .topdeps which tg patch already does I fear that having a branch per topic is generally okay but not if you want clean history including micro commits to be send upstream. 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]
