Importing two versions of a single project at once

[Guillaume Bilodeau <gb...@yahoo.com>]

Hi all,

I have inherited a project that I will manage using Subversion.  The repository doesn't exist yet and will need to be setup.  I have two code bases: one for v1.0, which was already shipped, and a second for ongoing v2.0 development, which is not yet finished.  Some substantial improvements will need to be integrated into a new v1.1 version and, when completed, ported to v2.0.

I am completely new to Subversion and I've never been on the management side of SCM, always a user, so I don't know how to setup the repository and manage this development scenario.  How should I go about doing this?  Right now I'm leaning towards the following procedure:

1- install Subversion server on remote server
2- create the SVN repository
3- create main local directory (for source files)
4- copy all v1.0 files into main local directory
5- import the main local directory in the repo trunk
6- create a v1.0 tag from the repo trunk
7- create a v1.1 branch from the v1.0 tag
8- delete all files and directories in the main local directory (including .svn directories)
9- copy all v2.0 files to main local directory
10- commit to repo trunk
11- create a v2.0 tag from the repo trunk
12- develop v1.1 using the v1.1 branch
13- when v1.1 development is complete, create a v1.1 tag from the v1.1 branch
14- merge v1.1 branch into trunk
15- delete v1.1 branch

Does this make any sense?

Thanks a lot,
GB

Re: Importing two versions of a single project at once

[Miha Vitorovic <mv...@nil.si>]

Guillaume Bilodeau <gb...@yahoo.com> wrote on 08.06.2006 09:24:11:

> Hi all,
> 
> I have inherited a project that I will manage using Subversion.  The 
> repository doesn't exist yet and will need to be setup.  I have two 
> code bases: one for v1.0, which was already shipped, and a second for 
> ongoing v2.0 development, which is not yet finished.  Some substantial
> improvements will need to be integrated into a new v1.1 version and, 
> when completed, ported to v2.0.
> 
> I am completely new to Subversion and I've never been on the 
> management side of SCM, always a user, so I don't know how to setup 
> the repository and manage this development scenario.  How should I go 
> about doing this?  Right now I'm leaning towards the following 
procedure:
> 

Since it is a new repository and you don't have any history, you are 
complicating way too much.

I suggest you do it like this:

0 - do a full backup of all your files!!!!! :)

> 1- install Subversion server on remote server
> 2- create the SVN repository

Create directories on disk:
/tmp/repo-imp/trunk/
/tmp/repo-imp/tags/v1.0
/tmp/repo-imp/branches/

Copy your v1.0 files into /tmp/repo-imp/tags/v1.0

Copy your v2.0 files into /tmp/repo-imp/trunk/

cd /tmp/repo-imp/

svn import . svn://host/repository -m "Initial import"

delete /tmp/repo-imp since it is no longer needed

> 7- create a v1.1 branch from the v1.0 tag

> 11- create a v2.0 tag from the repo trunk

checkout the trunk where you need it

checkout the v1.1 branch where you need it

continue with the development

> 13- when v1.1 development is complete, create a v1.1 tag from the v1.1 
branch
> 14- merge v1.1 branch into trunk
> 15- delete v1.1 branch

Regards, 
---
  Miha Vitorovic
  Inženir v tehničnem področju
  Customer Support Engineer

   NIL Data Communications,  Tivolska cesta 48,  1000 Ljubljana,  Slovenia
   Phone +386 1 4746 500      Fax +386 1 4746 501     http://www.NIL.si

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