On 8/30/13 1:52 PM, Armin Le Grand wrote: > Hi Andrea, > > On 30.08.2013 13:23, 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. > > I do it exactly that way round, main reason is that I can only give an > evaluation if the fix is save to go to AOO401 if I have done it, so I > first do it on trunk where it is needed in any case. If it's safe to get > to AOO401, I then merge it there.
ok I see most others including you fix it first on trunk and then merge it on the branch. I will adapt this way in the future ;-) Juergen > > HTH! >> >> Regards, >> Andrea. >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org >> For additional commands, e-mail: dev-h...@openoffice.apache.org >> > -- > ALG > > --------------------------------------------------------------------- > 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
