[mapguide-internals] /branches root directory reserved only for MapGuide?

[Trevor Wekel]

Other open source projects do follow similar trunk/branch conventions.
http://svn.apache.org/repos/asf/httpd/httpd/trunk/
http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/
http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/


I like the fact that the "Tools" resides under the MapGuide vault.  The tools do not work against any other GIS product so maintaining the association is reasonable in my mind.

Another alternative is to move Tools to the root of the tree and trunk/branch each tool separately.  We sort of do this for the sandboxes right now.  We should also remove Tools from mapguide/trunk/Tools once we make this change.

http://svn.osgeo.org/mapguide/Tools/Maestro/trunk
http://svn.osgeo.org/mapguide/Tools/Maestro/branches/2.1
http://svn.osgeo.org/mapguide/Tools/GISTool/trunk
http://svn.osgeo.org/mapguide/Tools/GISTool/branches/1.0

The code bases under Maestro/trunk and Maestro/branches/2.1 should have an identical layout.

Regards, 
Trevor


-----Original Message-----
From: mapguide-internals-bounces at lists.osgeo.org [mailto:mapguide-internals-bounces at lists.osgeo.org] On Behalf Of Jason Birch
Sent: May 3, 2010 10:31 AM
To: MapGuide Internals Mail List
Subject: Re: [mapguide-internals] /branches root directory reserved only for MapGuide?

I'm not sure why it is important that the branch structure matches the
trunk. MapGuide (and its related installer) is a distinct product from
Maestro, so the MapGuide version numbers don't make sense. We've
already adopted this product-based system under tags.

Ideally we'd have a separate svn tree (and Trac) for Maesto, but
didn't persue this at the time. Should this be revisited?

On 2010-05-03, Trevor Wekel <trevor_wekel at otxsystems.com> wrote:
> Hmm... Branches should match the structure under trunk.  I am personally ok
> with having Tools out of sync with MgDev and Installer.  We should probably
> add a compatibility section to the wiki somewhere.
>
> /branches/2.1/Tools (whatever version 2.1 means for each of the tools, not
> in sync with MgDev and Installer)
> /branches/2.1/MgDev (version 2.1 for MapGuide Server and Web Extensions)
> /branches/2.1/Installer (installer for version 2.1 of MapGuide)
>
> Trevor
>
> -----Original Message-----
> From: mapguide-internals-bounces at lists.osgeo.org
> [mailto:mapguide-internals-bounces at lists.osgeo.org] On Behalf Of Jason
> Birch
> Sent: May 3, 2010 9:17 AM
> To: MapGuide Internals Mail List
> Subject: Re: [mapguide-internals] /branches root directory reserved only for
> MapGuide?
>
> Maestro versions don't normally match MapGuide versions, and are on a
> different release cycle. I personally feel that it would make more
> sense to have distinct Maestro branches than to place them within
> existing MapGuide branches.
>
> On 2010-05-03, Trevor Wekel <trevor_wekel at otxsystems.com> wrote:
>> I'm ok with using the existing branching mechanism. The branches should
>> match the trunk layout.
>>
>> /branches/2.1/Tools/Maestro
>> (Just add Tools/Maestro)
>>
>> /branches/2.2/Installer
>> /branches/2.2/MgDev
>> (At some point we should set this branch up.  Was hoping to get RFC 90 in
>> first)
>>
>> Regards,
>> Trevor
>>
>> -----Original Message-----
>> From: mapguide-internals-bounces at lists.osgeo.org
>> [mailto:mapguide-internals-bounces at lists.osgeo.org] On Behalf Of Jason
>> Birch
>> Sent: May 3, 2010 3:00 AM
>> To: MapGuide Internals Mail List
>> Subject: Re: [mapguide-internals] /branches root directory reserved only
>> for
>> MapGuide?
>>
>> I think we discussed this when we were initially bringing Maestro in.
>>
>> It was a while back, but I think the intention was to just use a
>> prefix for the Maestro branches (/branches/Maestro-2.1, etc...)
>> similar to how its done in tags.
>>
>> On 2010-05-03, Jackie Ng <jumpinjackie at gmail.com> wrote:
>>>
>>> Hi All,
>>>
>>> I'd like to make a "2.1" branch for Maestro since I plan to do some
>>> massive
>>> API changes/enhancements/overhauls post-2.1
>>>
>>> Can I put a 2.1 branch under the top-level "branches" svn directory? Or
>>> is
>>> this only for MapGuide's use?
>>>
>>> - Jackie
>>> --
>>> View this message in context:
>>> http://osgeo-org.1803224.n2.nabble.com/branches-root-directory-reserved-only-for-MapGuide-tp4996834p4996834.html
>>> Sent from the MapGuide Internals mailing list archive at Nabble.com.
>>> _______________________________________________
>>> mapguide-internals mailing list
>>> mapguide-internals at lists.osgeo.org
>>> http://lists.osgeo.org/mailman/listinfo/mapguide-internals
>>>
>> _______________________________________________
>> mapguide-internals mailing list
>> mapguide-internals at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/mapguide-internals
>>
>>
> _______________________________________________
> mapguide-internals mailing list
> mapguide-internals at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/mapguide-internals
>
>
_______________________________________________
mapguide-internals mailing list
mapguide-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapguide-internals