On 8/30/13 1:23 PM, Andrea Pescetti wrote: > What is the recommended way to merge commits to AOO401? As I see it, the > textbook steps would be to cherry-pick them from trunk, so: > > 1) Commit fix to trunk as revision N (in my case, 1518832, affecting > main/extensions.lst) > > 2) Chdir to an AOO401 checkout > > 3) Check the diff to be applied with something like > > main$ svn diff -c 1518832 > https://svn.apache.org/repos/asf/openoffice/trunk/main/extensions.lst > > 4) Merge the commit by cherry-picking, with something like > > main$ svn merge -c 1518832 > https://svn.apache.org/repos/asf/openoffice/trunk/main/extensions.lst > > Is this the recommended way? Or are showstoppers supposed to be fixed on > AOO401 first and be ported to trunk later, maybe with a single merge > operation? If there are some conventions, I'll apply them for the fixes > I'll commit during the weekend.
important is that the fix is available on both. I fix it on the branch first and merge it on trunk. Others do it exactly in the way you did. But in general I think it make sense if the developer takes care of making the fix available where needed. If we have a bigger range of changes made on a branch and changes made in parallel on trunk merging it in one step can be trigger many conflicts. But I am open for everything Juergen > > Regards, > Andrea. > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
