[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

use case question

From: Phil Lawrence <prlawrence_at_Lehigh.EDU>
Date: 2005-07-08 22:20:47 CEST

I'm trying to design our usage of svn... We'll be tracking a
repository of code that gets along with a vendor-provided product.

As long as we're using VEN6 (version 6 of the vendor product),
everything is pretty straightforward. Note that we do NOT put the
vendor code into our repository.

Example:
   Change the frabblewizzit, as per issue tracker #656
   $ svn copy $SVN/ven/trunk $SVN/ven/branches/656 -m "Creating
branch for issue #656"
   $ svn co $SVN/ven/branches/656/.../frabbles ~/Dev/656
   ... do some work ...
   $ svn commit ~/Dev/656
   $ svn merge -rnnn:nnn ~/Dev/656 $SVN/ven/trunk

But what about when VEN7 arrives? We can create a VEN7 branch from
our current HEAD, and work for a while on that branch to get it to
work with the new vendor software.

But, what would we do with the frabblewizzit example? Do we merge
branch 656 -> HEAD and then merge the HEAD change into the VEN7 branch?

Or do we wait until VEN7 is pretty stable, and then merge the
changeset of all the recent HEAD revisions into the VEN7 branch, and
then continue to merge all HEAD revisions into VEN7 as they happen?
And then finally merge VEN7 somehow back into HEAD when we upgrade?

Or do we not merge *anything* from HEAD into VEN7 and just merge VEN7
into HEAD when we're ready for the upgrade?

Thanks,
Phil
  

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 22:23:00 2005

This is an archived mail posted to the Subversion Users mailing list.