[xen-tools-dev] [PATCH 00/17] Next bunch of patches

[Dmitry Nedospasov]

On Mon, Jul 26, 2010 at 05:46:44PM +0200, Stéphane Jourdois wrote:
> The tiny problem with that solution is that you ruin the commitId,
> and I have to rebase and remove my commits even if you merged them
> :-)
> I don't really care, but perhaps somebody can explain :)

Yeah you have a point in that, were we to commit all the patches as is,
then the tree would be the same. However I'm not entirely certain tha
this scales well with the volumes of Patches that are being commited.

This means that the first patch in the set is a bottleneck for any later
patches.

With rebase -i it's simply a matter of removing the patches applied
upstream from the list. I think this is the easiest way to do this. 

I mean I am open to discussion on how to best merge patches. I think
rebasing is the quickest way to merge the patches both upstream and
modifying them localy (for you) in the case that you want to change
something.

Alternatively you can either merge any upstream commits everytime there
are some, or, as you already said, create a branch everytime you plan to
send something upstream. 

D.
-- 
Dmitry Nedospasov <dmitry at nedos.net> -- Twitter: @nedos
Web: http://nedos.net -- Github: http://github.com/nedos