On 2-6-2014 2:21, Josh Andler wrote:
If you have a nice portioned piece of work, I encourage you to
propose that for merging (as you say, to the experimental branch).
Having one large merge at the end of GSoC is not very nice, and
sometimes that means it does not happen at all. From what I read
about your project here on the mailinglist, it seems your work is
very suited for small merges to exp branch along the way. It makes
it much easier to disect what changes belong to what topic. I am
convinced that trunk/experimental gets orders of magnitude more
testing done than your branch, and small merges make it easier to
find bugs if any do arise.
A disadvantage (at this moment) might be that experimental and trunk
may diverge a lot, to the point where it becomes a burden to
apply/backport bug fixes to both branches.
At the end of GSoC, Google wants you to submit an overall diff, so
make sure you keep track of all your changes if some of your work
gets merged in along the way.
Indeed :)
-Johan