SVN Repository re-ordering

I'm proposing to reorder the 'orocos' svn module in order to create clarity
in some confusing path names. This requires coordination from RTT, BFL and
KDL maintainers. I believe my proposition can be improved, so if you got
better/other ideas, let us know.

Old situation:

[FOLDER] hardware-hotspots/
[FOLDER] kdl/
[FOLDER] orocos-1.0/
[FOLDER] orocos-apps/
[FOLDER] orocos-branches/
[FOLDER] orocos-components/
[FOLDER] orocos-devel/
[FOLDER] orocos-tags/
[FOLDER] orocos-trunk/
[FOLDER] trunk/

new:

[FOLDER] hardware-hotspots/
[REMOVE: kdl/]
[RENAME: orocos-1.0/ to orocos-www]
[FOLDER] orocos-apps/
[FOLDER] orocos-branches/ (move kdl/bfl branches here)
[REMOVE: orocos-components/]
[FOLDER] orocos-devel/
[FOLDER] orocos-tags/ (move kdl/bfl tags here)
[REMOVE: orocos-trunk/ (identical to orocos-branches/branch-1.0)]
[FOLDER] trunk/
ADD : trunk/rtt (RTT 1.2 branch)
ADD : trunk/ocl (from orocos-components)
ADD : trunk/kdl (from kdl/)
ADD : trunk/bfl (from ... actsens)

Part of 'new' is already in place.

* orocos-branches/ will continue to host branches, for example the RTT 1.2
branch name will be named 'rtt-1.2/'. Or if you prefer
'orocos-branches/rtt/1.2'
* orocos-tags/ will continue to host tags, and named as in 'orocos-kdl-1.0/',
or if you prefer, 'orocos-tags/kdl/1.0'

I'm sure we could change 'orocos-apps' as well, but it's yet unclear to me
what the best solution is.

Peter

wmeeusse's picture

SVN Repository re-ordering

> new:
>
> [FOLDER] hardware-hotspots/
> [REMOVE: kdl/]
> [RENAME: orocos-1.0/ to orocos-www]
> [FOLDER] orocos-apps/
> [FOLDER] orocos-branches/ (move kdl/bfl branches here)
> [REMOVE: orocos-components/]
> [FOLDER] orocos-devel/
> [FOLDER] orocos-tags/ (move kdl/bfl tags here)
> [REMOVE: orocos-trunk/ (identical to orocos-branches/branch-1.0)]
> [FOLDER] trunk/
> ADD : trunk/rtt (RTT 1.2 branch)
> ADD : trunk/ocl (from orocos-components)
> ADD : trunk/kdl (from kdl/)
> ADD : trunk/bfl (from ... actsens)
>
> Part of 'new' is already in place.

The current situation where only _part_ of 'net' is in place is causing
confusion for many PMA users. What combination of RTT/KDL/OCL/BLF should we
use now?

Wim

SVN Repository re-ordering

Quoting Wim Meeussen <wim [dot] meeussen [..] ...>:

>> new:
>>
>> [FOLDER] hardware-hotspots/
>> [REMOVE: kdl/]
>> [RENAME: orocos-1.0/ to orocos-www]
>> [FOLDER] orocos-apps/
>> [FOLDER] orocos-branches/ (move kdl/bfl branches here)
>> [REMOVE: orocos-components/]
>> [FOLDER] orocos-devel/
>> [FOLDER] orocos-tags/ (move kdl/bfl tags here)
>> [REMOVE: orocos-trunk/ (identical to orocos-branches/branch-1.0)]
>> [FOLDER] trunk/
>> ADD : trunk/rtt (RTT 1.2 branch)
>> ADD : trunk/ocl (from orocos-components)
>> ADD : trunk/kdl (from kdl/)
>> ADD : trunk/bfl (from ... actsens)
>>
>> Part of 'new' is already in place.
>
>
> The current situation where only _part_ of 'net' is in place is causing
> confusion for many PMA users. What combination of RTT/KDL/OCL/BLF should we
> use now?

I have two answers for that
1. That's your own responsibility. Create a pma-branch, only merge the
patches that you want from trunk, make sure your pma-branch is always
in a consistent state and ready-to-go.
2. Invest time in trunk/[kdl/bfl/ocl] such that they always follow rtt
and each other and that bugs are detected as soon as possible.

Peter

wmeeusse's picture

SVN Repository re-ordering

> > The current situation where only _part_ of 'new' is in place is causing
> > confusion for many PMA users. What combination of RTT/KDL/OCL/BLF should
> > we use now?

> I have two answers for that
> 1. That's your own responsibility. Create a pma-branch, only merge the
> patches that you want from trunk, make sure your pma-branch is always
> in a consistent state and ready-to-go.
> 2. Invest time in trunk/[kdl/bfl/ocl] such that they always follow rtt
> and each other and that bugs are detected as soon as possible.

At PMA we always tried to use the latest versions of the orocos projects
(trunk). This has been a good approach for us (always the latest bugfixes)
and this also helped the orocos project to test and debug its current state
of the art. The problem is that it isn't clear where we find the latest
version of orocos now. I understand we have to use orocos/trunk/, but there I
couldn't find the ocl project. And the kdl seemes to have two "most recent"
version (trunk/kde and kdl/trunk).

Wim

SVN Repository re-ordering

Quoting Wim Meeussen <wim [dot] meeussen [..] ...>:

>> > The current situation where only _part_ of 'new' is in place is causing
>> > confusion for many PMA users. What combination of RTT/KDL/OCL/BLF should
>> > we use now?
>
>> I have two answers for that
>> 1. That's your own responsibility. Create a pma-branch, only merge the
>> patches that you want from trunk, make sure your pma-branch is always
>> in a consistent state and ready-to-go.
>> 2. Invest time in trunk/[kdl/bfl/ocl] such that they always follow rtt
>> and each other and that bugs are detected as soon as possible.
>
> At PMA we always tried to use the latest versions of the orocos projects
> (trunk). This has been a good approach for us (always the latest bugfixes)
> and this also helped the orocos project to test and debug its current state
> of the art. The problem is that it isn't clear where we find the latest
> version of orocos now. I understand we have to use orocos/trunk/, but there I
> couldn't find the ocl project. And the kdl seemes to have two "most recent"
> version (trunk/kde and kdl/trunk).
>

Hence the proposal to reorder the svn repository layout. I'll leave kdl
and bfl to the respective maintainers. I'll move 'orocos-components' to
trunk/ocl today and fix the 'rtt' related branches as well. If you have
a patch waiting on orocos-components, you can 'svn diff' it and apply
it later on trunk/ocl.

Peter

Ruben Smits's picture

SVN Repository re-ordering

On Tuesday April 17 2007 13:12:14 Peter Soetens wrote:
> Quoting Wim Meeussen <wim [dot] meeussen [..] ...>:
> >> > The current situation where only _part_ of 'new' is in place is
> >> > causing confusion for many PMA users. What combination of
> >> > RTT/KDL/OCL/BLF should we use now?
> >>
> >> I have two answers for that
> >> 1. That's your own responsibility. Create a pma-branch, only merge the
> >> patches that you want from trunk, make sure your pma-branch is always
> >> in a consistent state and ready-to-go.
> >> 2. Invest time in trunk/[kdl/bfl/ocl] such that they always follow rtt
> >> and each other and that bugs are detected as soon as possible.
> >
> > At PMA we always tried to use the latest versions of the orocos projects
> > (trunk). This has been a good approach for us (always the latest
> > bugfixes) and this also helped the orocos project to test and debug its
> > current state of the art. The problem is that it isn't clear where we
> > find the latest version of orocos now. I understand we have to use
> > orocos/trunk/, but there I couldn't find the ocl project. And the kdl
> > seemes to have two "most recent" version (trunk/kde and kdl/trunk).
>
> Hence the proposal to reorder the svn repository layout. I'll leave kdl
> and bfl to the respective maintainers.

I moved the experimental and not yet working branch of kdl from trunk/kdl to
trunk/kdl-experimental and the working trunk of kdl from kdl/trunk/kdl to the
new location: trunk/kdl

The location of the kdl-apps and branches remain in their current location
until an appropriate new location is proposed.

Ruben

SVN Repository re-ordering

Quoting Ruben Smits <Ruben [dot] Smits [..] ...>:
> I moved the experimental and not yet working branch of kdl from trunk/kdl to
> trunk/kdl-experimental and the working trunk of kdl from kdl/trunk/kdl to the
> new location: trunk/kdl

kdl-experimental must be moved into orocos/branches instead of
orocos/trunk. Trunk only contains one directory for each project, being
the 'main' line. All development lines must go into orocos/branches. To
save time, you can do a server-side 'svn mv'.

>
> The location of the kdl-apps and branches remain in their current location
> until an appropriate new location is proposed.

Why not under orocos-apps ?

Peter

Ruben Smits's picture

SVN Repository re-ordering

On Tuesday April 17 2007 13:57:54 Peter Soetens wrote:
> Quoting Ruben Smits <Ruben [dot] Smits [..] ...>:
> > I moved the experimental and not yet working branch of kdl from trunk/kdl
> > to trunk/kdl-experimental and the working trunk of kdl from kdl/trunk/kdl
> > to the new location: trunk/kdl
>
> kdl-experimental must be moved into orocos/branches instead of
> orocos/trunk. Trunk only contains one directory for each project, being
> the 'main' line. All development lines must go into orocos/branches. To
> save time, you can do a server-side 'svn mv'.

ok, i'll do this

>
> > The location of the kdl-apps and branches remain in their current
> > location until an appropriate new location is proposed.
>
> Why not under orocos-apps ?

I find it disturbing to have trunk/stuff, branches/stuff, and then out of the
blue: orocos-apps, why don't we move it to apps/stuff??

Ruben

> Peter
>
> --
> www.fmtc.be
>
>
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.

SVN Repository re-ordering

Quoting Ruben Smits <Ruben [dot] Smits [..] ...>:
>>
>> > The location of the kdl-apps and branches remain in their current
>> > location until an appropriate new location is proposed.
>>
>> Why not under orocos-apps ?
>
> I find it disturbing to have trunk/stuff, branches/stuff, and then out of the
> blue: orocos-apps, why don't we move it to apps/stuff??

Fine.

orocos/orocos-apps ==> orocos/apps/rtt/ (me)
orocos/kdl/trunk/apps ==> orocos/apps/kdl/ (you)

Peter

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

Quoting Peter Soetens

<peter [dot] soetens [..] ...>:
>
> orocos/orocos-apps ==> orocos/apps/rtt/ (me)
> orocos/kdl/trunk/apps ==> orocos/apps/kdl/ (you)

It did not take into account the numerous non 'rtt' applications under
orocos-apps/applications, which has the most number of people working
on.

I would recommend to relocate that directory to

orocos/apps/pma

While the orocos-apps/examples|ktaskbrowser|... could go into

orocos/apps/rtt

Please note that you can 'follow' the moves using the 'svn sw
--relocate' command in your current svn working directory:

cd orocos-apps/applications
svn sw --relocate \
https://svn.mech.kuleuven.be/repos/orocos/orocos-apps/applications \
https://svn.mech.kuleuven.be/repos/orocos/apps/pma
svn up

But only apply this when the move is made.

Now is the time to write your opinion,
Peter

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

wmeeusse's picture

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

> I would recommend to relocate that directory to
>
> orocos/apps/pma

Where did the pma applications go? The folder seems to be missing...

wmeeusse's picture

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

On Tuesday 17 April 2007 15:42:58 Wim Meeussen wrote:
> > I would recommend to relocate that directory to
> >
> > orocos/apps/pma
>
> Where did the pma applications go? The folder seems to be missing...

Found! in the httpS websvn :-)

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

Quoting Wim Meeussen <wim [dot] meeussen [..] ...>:

>> I would recommend to relocate that directory to
>>
>> orocos/apps/pma
>
> Where did the pma applications go? The folder seems to be missing...

I am politely waiting for comments before(*) making the move.

Peter

(*) I did move it first, but then reverted the move again when I
realised how many people are working in this directory.

Ruben Smits's picture

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

On Tuesday April 17 2007 15:26:38 Peter Soetens wrote:
> Quoting Wim Meeussen <wim [dot] meeussen [..] ...>:
> >> I would recommend to relocate that directory to
> >>
> >> orocos/apps/pma
> >
> > Where did the pma applications go? The folder seems to be missing...
>
> I am politely waiting for comments before(*) making the move.

Maybe we should wait until the PMA-master thesis students are finished with
their work, because they will probably panic if they don't find their
applications anymore.

Ruben

wmeeusse's picture

IMPORTANT: orocos-apps/applications relocation (Was: SVN Reposi

> Now is the time to write your opinion,
> Peter

Very nice and clean!!! In the future I'll have to push myself a lot harder to
try to get confused about the svn repository :-)

wmeeusse's picture

SVN Repository re-ordering

> I'm proposing to reorder the 'orocos' svn module in order to create clarity
[..]
> new:
>
> [FOLDER] hardware-hotspots/
> [REMOVE: kdl/]
> [RENAME: orocos-1.0/ to orocos-www]
> [FOLDER] orocos-apps/
> [FOLDER] orocos-branches/ (move kdl/bfl branches here)
> [REMOVE: orocos-components/]
> [FOLDER] orocos-devel/
> [FOLDER] orocos-tags/ (move kdl/bfl tags here)
> [REMOVE: orocos-trunk/ (identical to orocos-branches/branch-1.0)]
> [FOLDER] trunk/
> ADD : trunk/rtt (RTT 1.2 branch)
> ADD : trunk/ocl (from orocos-components)
> ADD : trunk/kdl (from kdl/)
> ADD : trunk/bfl (from ... actsens)

Do we still need the hardware-hotspots? As far as I know all this code was
ported to the orocos taskcontext and movet to ocl/hardware.

Wim