-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 01/03/10 22:41, Bernhard Schmidt wrote: > Hi David, > >>> It doesn't make a difference at the moment (since the patch came from >>> feat_ipv6_payload in the first place), but what's the general wish for >>> the future? What to rebase on? >> >> To be very honest, I'm very uncertain about what's best. Because it >> will a lot of changes in multiple branches. But as I'm able now to keep >> the bugfix2.1 branch pretty clean with only bugfixes, I begin to lean >> towards that you should consider to rebase on that branch. > > Could you please have a look at git://git.birkenwald.de/openvpn.git > test-rebase branch? The history of gert-ipv6 was starting to look a bit > weird (duplicate commits with the same content), to I rebased it on your > bugfix2.1 branch (and dropped the duplicate commits in the process). No > difference in the content whatsoever and the history looks much better, > but I'm not exactly sure whether this is the right thing to do. >
I tried to both merge and rebase both your gert-ipv6 branch and the test-rebase branch from the allmerged branch. That was quite an interesting experience. The test-rebase branch gave most problems. Both rebase and merge got painful. While with the gert-ipv6 gave only (expected, though) issues with rebase. Merging in gert-ipv6 was more or less painless. The only conflict was the title string in options.c, which will always be a conflict area when merging in multiple feature branches. But this conflict is really trivial, and I'm not worried about that one. I will try to ask some kernel guys about such situation what they would recommend. Regarding to the "duplicated commits", I believe that's what's happens especially when cherry-picks are involved. Not sure how bad Gerts history was though. But you might get an idea when using git log - --graph ... then you see better which branch each commits belongs to. kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAkuMOK0ACgkQDC186MBRfrqiXACfVUnAITzSpEJCM74dgrVfCQPY PJ8An0NbhiMdxIUkZCrmRr7+SlLlN3Rs =d7ys -----END PGP SIGNATURE-----
