Apart from the branches it seems we have a directory called "trunk-orig", that only seems to contain 3 files, are they important ??
+1 to remove branches when they are integrated, it gives a lot better overview. Jan. On 15 November 2012 13:19, Rob Weir <robw...@apache.org> wrote: > On Wed, Nov 14, 2012 at 7:03 PM, Andrew Rist <andrew.r...@oracle.com> > wrote: > > > > On 11/14/2012 3:10 PM, Rob Weir wrote: > >> > >> I see that our project is growing new branches. Would it make sense > >> to start documenting these on a wiki page, so it is clear what each > >> one is, and who is maintaining it? > >> > >> Current branches are: > >> > >> AOO34/ --- Our 3.4.x branch, would be used if we ever need a 3.4.2 > >> > >> alg/ -- This is Armin's long-term graphics rendering improvement work, > >> maybe integrated for AOO 4.1 > >> > >> gbuild/ -- This looks new, from Andrew. Sounds build-related. But > >> what is it? And what is the plan for getting it integrated? Is this > >> planned AOO 4.0? > > > > This is a continuation of this: > > > http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201209.mbox/%3c505a1dc4.5030...@oracle.com%3E > > > > integration of a set of CWSes: > > ause131 > > ause130 > > writerfilter10 > > gnumake4 > > sd2gbuild > > > > And integration? Is this targeted for AOO 4.0? If so it would be > good to get it reflected in this table: > > https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Planning > > That helps with the QA planning. The more we know about what is going > into 4.0, the more we can start thinking about how we will test it, > maybe even start writing the test cases for new features, if the > design is clear enough now. > > Thanks! > > -Rob > > > The initial branch for doing this work was deleted and this new branch > > created. With the original branch, I had applied all of the patches en > > masse, followed by one massive check-in. We'll just say that this was > > sub-optimal. After discussions at ApacheConEU - it was decided the best > > course was to start from scratch, that way we don't have to merge up to > the > > latest trunk. I'm in the process now of applying and committing all the > > patches, followed by changing all the headers in newly created files. > > > > > > fun > > > > > > A. > > > >> > >> writer001/ -- Ditto. What is it and what is the plan for getting it > >> integrated? > >> > >> Thanks! > >> > >> -Rob > > > > >
