Re: Importing two versions of a single project at once

It makes sense, but the business of switching your trunk from v1.0 to v2.0 is problematic the way you're doing it. Deleting local directories including .svn subdirectories is not how to flush/re-install things in subversion.

Me, I would import create 1.0 as a tag, check it out, then do a careful integration of the new 2.0 files on top of that, and create that as a new tag. That gives you a single set of changes to go from v1.0 to v2.0, recorded in Subversion.

Then I would copy the 1.0 tag to the trunk, and branch from that for 1.1 development.

The trunk should not contain 2.0 until you are ready for 2.0 to be the mainline of code development. People can branch from the 2.0 tag as necessary until you're ready to integrate those changes.
  ----- Original Message -----
  From: Guillaume Bilodeau
  To: users@subversion.tigris.org
  Sent: Thursday, June 08, 2006 8:15 AM
  Subject: Importing two versions of a single project at once

  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?
Received on Thu Jun 8 14:53:50 2006