You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Ingrid von der Mehden <In...@gmx-topmail.de> on 2011/08/06 11:21:59 UTC
[Proposal] target directories for initial import
There are two repositories that we need to import, so the usual idea of
putting all into trunk does not work out of the box here.
Coming from the thread 'OOO340 to svn - directory setup', I would like
to make the following proposal for the target directories.
Import the repository from http://hg.services.openoffice.org/OOO340
which contains the main office part into a directory
ooo/trunk/main
This should result in directories like:
ooo/trunk/main/UnoControls
ooo/trunk/main/accessibility
etc.
Import http://hg.services.openoffice.org/master_l10n/OOO340/
which contains the translation into a directory
ooo/trunk/extras
This should result in directories like:
ooo/trunk/extras/l10n/source
(The former l10n repository duplicates its parent directory but it seems
to me that this is not necessary. Maybe Ivo knows more.)
Advantages:
The main office code that is needed for day to day code development is
still separated from the translation part and can be obtained easily by:
svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk/main aoo
Further all code line dependent stuff is inside trunk. So this can be
obtained easily by
svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk aoo_full
And the directory structure is self explaining.
Note, this setup does not affect later CWS merging as the structure of
the main repository was not changed at all.
Kind regards,
Ingrid
Re: [Proposal] target directories for initial import
Posted by Ingrid von der Mehden <In...@gmx-topmail.de>.
Am 06.08.2011 17:54, schrieb Christian Lohmaier:
> Hi Ingrid, *,
>
> On Sat, Aug 6, 2011 at 11:21 AM, Ingrid von der Mehden
> <In...@gmx-topmail.de> wrote:
>> There are two repositories that we need to import, so the usual idea of
>> putting all into trunk does not work out of the box here.
>> Coming from the thread 'OOO340 to svn - directory setup', I would like to
>> make the following proposal for the target directories.
>>
>> Import the repository from http://hg.services.openoffice.org/OOO340 which
>> contains the main office part into a directory
>> ooo/trunk/main
>
> This is not practical. At least not when using mercurials convert extension.
> It will end up in / of the repo, i.e. if you want to have it in
> another place, you have to move it afterwards.
>
As long as we move the directories to the suggested locations before we
start all the concrete coding, documentation and scripting around, I see
no problem.
Kind regards,
Ingrid
> i.e. in pseudo-notation svndumfilter include trunk | sed to remove
> trunk prefix |svnadmin load
> followed by creation of the map, then hg convert.
>
> ciao
> Christian
>
Re: [Proposal] target directories for initial import
Posted by Christian Lohmaier <cl...@openoffice.org>.
Hi Ingrid, *,
On Sat, Aug 6, 2011 at 11:21 AM, Ingrid von der Mehden
<In...@gmx-topmail.de> wrote:
> There are two repositories that we need to import, so the usual idea of
> putting all into trunk does not work out of the box here.
> Coming from the thread 'OOO340 to svn - directory setup', I would like to
> make the following proposal for the target directories.
>
> Import the repository from http://hg.services.openoffice.org/OOO340 which
> contains the main office part into a directory
> ooo/trunk/main
This is not practical. At least not when using mercurials convert extension.
It will end up in / of the repo, i.e. if you want to have it in
another place, you have to move it afterwards.
i.e. in pseudo-notation svndumfilter include trunk | sed to remove
trunk prefix |svnadmin load
followed by creation of the map, then hg convert.
ciao
Christian
RE: [Proposal] target directories for initial import
Posted by Gavin McDonald <ga...@16degrees.com.au>.
> -----Original Message-----
> From: Ingrid von der Mehden [mailto:IngridvdM@gmx-topmail.de]
> Sent: Saturday, 6 August 2011 7:22 PM
> To: ooo-dev@incubator.apache.org
> Cc: ivo@apache.org
> Subject: [Proposal] target directories for initial import
>
> There are two repositories that we need to import, so the usual idea of
> putting all into trunk does not work out of the box here.
> Coming from the thread 'OOO340 to svn - directory setup', I would like to
> make the following proposal for the target directories.
>
> Import the repository from http://hg.services.openoffice.org/OOO340
> which contains the main office part into a directory ooo/trunk/main This
> should result in directories like:
> ooo/trunk/main/UnoControls
> ooo/trunk/main/accessibility
> etc.
>
> Import http://hg.services.openoffice.org/master_l10n/OOO340/
> which contains the translation into a directory ooo/trunk/extras This
should
> result in directories like:
> ooo/trunk/extras/l10n/source
> (The former l10n repository duplicates its parent directory but it seems
to me
> that this is not necessary. Maybe Ivo knows more.)
>
> Advantages:
>
> The main office code that is needed for day to day code development is
still
> separated from the translation part and can be obtained easily by:
> svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk/main aoo
>
> Further all code line dependent stuff is inside trunk. So this can be
obtained
> easily by svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk
> aoo_full
>
> And the directory structure is self explaining.
>
> Note, this setup does not affect later CWS merging as the structure of the
> main repository was not changed at all.
+1
Gav...
>
> Kind regards,
> Ingrid