You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Martin Landa <la...@gmail.com> on 2007/11/19 10:47:13 UTC

cvs2svn project migration - structure of SVN repo

Hi all,

I am cooperating on the migration of quite complicated CVS repo to
SVN. Originally, the CVS repo contains two directories:

grass5
grass6

grass6 HEAD is based on grass5 HEAD (grass6 has been created by
copying the files from grass5 a few years ago). There is also another
SVN repo called grass-addons. The goal is to put grass5, grass6 and
grass-addons to the single SVN repo. Also new branch for future
development called grass7 need to be created. This repo will be used
together with Trac software. Basically I can see three different
structures:

1)

/grass-svn
|
+---/grass5
|    |
|    +---/branches
|    |
|    +---/tags
|    |
|    +---/trunk
|
+---/grass6
|    |
|    +---/branches
|    |
|    +---/tags
|    |
|    +---/trunk
|
+---/grass7 (based on grass6 HEAD)
|    |
|    +---/branches
|    |
|    +---/tags
|    |
|    +---/trunk
|
+---/grassaddons
|    |
|    +---/trunk

2)

/grass-svn
|
+---/trunk (grass6 CVS HEAD + grassaddons)
|
+---/branches
|    |
|    +---/releasebranch_5_x (note: 5_5 based on grass5 CVS HEAD)
|    |
|    +---/releasebranch_6_x
|    |
|    +---/releasebranch_7_x (grass6 CVS HEAD)
|
+---/tags

3)
/grass-svn
|
+---/trunk
|    |
|    +---/grass5 (grass5 CVS HEAD)
|    |
|    +---/grass6 (grass6 CVS HEAD)
|    |
|    +---/grass7 (grass6 CVS HEAD, then modifications)
|    |
|    +---/grassaddons (grassaddons SVN HEAD)
|
+---/branches
|    |
|    +---/releasebranch_5_x
|    |
|    +---/releasebranch_6_x
|
+---/tags

I guess solution 1) is badly designed. What about 2) and 3)? I will
appreciate any hits, notes, suggestions, etc. If you are interested,
more detailed information are available on wiki-page [1].

Thanks a lot!

Regards Martin Landa

[1] http://grass.gdf-hannover.de/wiki/Migration_from_CVS_to_SVN

-- 
Martin Landa <la...@gmail.com> * http://gama.fsv.cvut.cz/~landa *

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: cvs2svn project migration - structure of SVN repo

Posted by "Bicking, David (HHoldings, IT)" <Da...@thehartford.com>.
> -----Original Message-----
> From: Martin Landa [mailto:landa.martin@gmail.com] 
> 
> I am cooperating on the migration of quite complicated CVS 
> repo to SVN. Originally, the CVS repo contains two directories:
> 
> grass5
> grass6
> 
> grass6 HEAD is based on grass5 HEAD (grass6 has been created 
> by copying the files from grass5 a few years ago). There is 
> also another SVN repo called grass-addons. The goal is to put 
> grass5, grass6 and grass-addons to the single SVN repo. Also 
> new branch for future development called grass7 need to be 
> created. This repo will be used together with Trac software. 
> Basically I can see three different
> structures:

<diagrams removed>

> I guess solution 1) is badly designed. What about 2) and 3)? 
> I will appreciate any hits, notes, suggestions, etc. If you 
> are interested, more detailed information are available on 
> wiki-page [1].
> 
> Thanks a lot!

First, as requested, your hit:  *THWAP*  :D

I suggest you migrate grass5 as its own project.  Presumably this one
will eventually be retired.  Grass6 should be imported as "Grass" (no
version identifier in its name) into the trunk folder.  If the grass
addons are dependent on grass, and won't be used for other projects, I'd
add the addons into trunk along with the rest of the project.  If these
addons are a bit more generic, create a separate project for them.

When you're ready to begin work on Grass7, tag the trunk for Grass6,
create a branch for Grass7.  Work on v7, and periodically merge to
trunk.  Etc., so forth, and so on until the end of time (or you don't
need any more Grass (whoa, cool man!).  Each new version is branched
from the trunk, which should be up to date with the prior version at the
moment of branching.  

This method works best with teams and processes small enough to warrant
an "unstable trunk" technique.  Things get more complicated from here,
and there are plenty of resource on the web.

--
David


*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org