+1 on the conservative approach that Marcus recommends. I understand that this is now being considered a low risk case. Still, better safe than sorry, especially since reverting from the trunk would be complicated.
- Dennis > -----Original Message----- > From: Marcus [mailto:marcus.m...@wtnet.de] > Sent: Tuesday, March 22, 2016 16:37 > To: dev@openoffice.apache.org > Subject: Re: branches/gbuild-reintegration merge? > [ ... ] > > wow and \o/ . Thats great news. :-) > > As non-coder I've not the biggest inside and knowledge. However, I'm > still afraid of breaking something in Trunk. So, please bear with me > when I ask the following: > > How big is the effort to do the opposite first? > > Copying your branch into a clone, updating it with the current Trunk, do > needed cleanup and fixes and then see how stable the builds on all our > supported platforms are. > > If this shows no bigger problems and little bugs can be handled in a > short time and are fixable, then we can think about how to bring your > branch into Trunk. > > Yes, maybe it looks a bit paranoid. But doing bigger fixes on Trunk > could be a problem for a longer time and this must be avoided. > > My 2 ct. > > Marcus > > > --------------------------------------------------------------------- > 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