I have added a new branch "l10n", to test the new l10n tools and make makefile/build changes without disturbing the main branch.
The wiki page "source code" is updated. Jan. On 22 November 2012 16:23, Juergen Schmidt <[email protected]> wrote: > > > > Am Donnerstag, 15. November 2012 um 22:20 schrieb jan iversen: > > > On 15 November 2012 22:16, Rob Weir <[email protected]> wrote: > > > > > On Thu, Nov 15, 2012 at 4:00 PM, jan iversen <[email protected]> > > > wrote: > > > > +1 to move. > > > > > > > > But please help me out with a simple question, if I delete a > > > file/directory > > > > in SVN, I assume it is only deleted from that version, so if I do a > > > > checkout of an old version it is included ?? > > > > > > > > > > > > > If you check out a tree you get the contents of that tree at that > > > specific revision. By default you get the most-recent revision, the > > > "head". But you can specify a specific earlier revision as needed. > > > This will also resurrect deleted files that existed in that revision. > > > > > > There are some administrative things an admin could do with svnadmin > > > dump and svndumpfilter to truly expunge a file, for legal or other > > > extreme reasons. But this is very rare. > > > > > > > If I am correct, why do we keep these things in trunk ? > > > > > > Not so much that anyone decided to keep it, but that no one decided to > > > clean it up. 2nd Law of Thermodynamics, etc. > > > > > > > > > Not I know why I never passed that exam as engineer....I think you once > > wrote to me JFDI, it is quite confusing when you try to get into the > code, > > and there seems to be more examples like "binfilter". > > > > > > binfilter is on the way to become removed ;-) > > Juergen > > > > > > > > > > Regards, > > > > > > -Rob > > > > > > > > > > rgds > > > > jan I. > > > > > > > > > > > > On 15 November 2012 21:57, Rob Weir <[email protected]> wrote: > > > > > > > > > On Thu, Nov 15, 2012 at 3:09 PM, jan iversen < > [email protected]> > > > > > wrote: > > > > > > 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. > > > > > > > > > > > > > > > > > > > > > These were some scripts we used during the original import of the > > > > > OpenOffice.org codebase. Not needed anymore, but if we want them > for > > > > > future reference they might be better under /devtools, maybe > directly > > > > > into /devtools/hg2svn (Was mainly concerned with migration from > > > > > Mercurial to SVN). > > > > > > > > > > If there are no objections I'll do such a move. > > > > > > > > > > -Rob > > > > > > > > > > > > > > > > Jan. > > > > > > > > > > > > On 15 November 2012 13:19, Rob Weir <[email protected]> wrote: > > > > > > > > > > > > > On Wed, Nov 14, 2012 at 7:03 PM, Andrew Rist < > [email protected] > > > > > > > > > > > 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/%[email protected]%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 > >
