Hi, merging changes in is fine by me, the longer they live on a separate branch, the more they will drift apart.
Unfortunately SVN is not very intelligent in such a case, I think you "rebased" trunk onto your branch at some point, but SVN sometimes does not see this and thus will spit out a lot of merge-conflicts as it tries to merge all these changes back again! Let me know if you run into a huge number of merge-conflicts, then we can try via git-svn to do the actual merging via Git and push to SVN from there as it may make the merge a lot easier. Dominik. Thanks... Dominik. Th On Sat, Jul 18, 2015 at 10:42 PM, Andreas Beeker <[email protected]> wrote: > Hi, > > I'm starting to merge the common sl branch to the trunk. > It probably takes a while for the first commit, but I think it's in a shape > to be merged. > There will be quite a few api-breaks, but this is natural, as the XSLF and > HSLF differ a > lot in certain areas ... and I either don't want to keep all the old > methods/structures > or the hierarchy is different (e.g. text handling in shapes). > A sketchy list of differences can be found in [1], but I will modify this > list while merging. > Furthermore there are still a lot of things to do, beside the recent bug > entries [1] > I will most focus on slide rendering. > I asked for review twice (... I think), but I guess we let the community > decide about > the changes and I will try to adapt to the old methods if the complaints get > too high > ... the problem with that is, that I have the impression that newer versions > of POI > aren't broadly used, so this might take a while ... > After the merge, I try to supply patches for TIKA where necessary. > > So up till now, I haven't merged/committed anything and look forward to any > hints > on a soft launch ;) > > Best wishes, > Andi > > [1] http://people.apache.org/~kiwiwings > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
