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

Multiple projects in a repository and merging

From: Pev <pev_at_audiogeek.co.uk>
Date: 2006-12-07 12:59:38 CET

Hi all,

    I'm trying to get my head round the philosophy of
repository layout to facilitate merging in 3rd party
code to a project and wanted to check with those that
have gone before to make sure I'm not thinking about
things the wrong way before I invest a lot of time
setting up the repository wrongly!

   So I have a porting project that utilises a library
from a 3rd party but within my project it has significant
changes to port to a different OS and platform. What
I'm thinking of doing is setting up the repository
thus :

/repository/
    /3rd_party_lib/
      /trunk/
      /tags/
        /3rd_party_release1/
        etc...
      /branches/
    /my_porting_project/
      /trunk/
        /3rd_party_lib_ported/
        /my_code/
      /tags/
        /copied_in_raw_3rd_party_release1/
      /branches/

At this point I'm thinking I should populate my local copy
of the 3rd party lib (prior to my porting work) via doing an
SVN COPY from :
   /repository/3rd_party_lib/tags/3rd_party_release1/
to :
   /repository/my_porting_project/trunk/3rd_party_lib_ported/

after that I can then add my changes and commit.

When I get new releases from the 3rd party I can merge them
in on the trunk at :
   /repository/3rd_party_lib/trunk/
and then tag as (for example) :
   /repository/3rd_party_lib/tags/3rd_party_releaseX/

then merge into my trunk where I've done the porting by
merging in the deta between
   /repository/3rd_party_lib/tags/3rd_party_release1/
   /repository/3rd_party_lib/tags/3rd_party_releaseX/
to :
   /repository/my_porting_project/trunk/3rd_party_lib_ported/

Does that sound correct / sane to people here? Are there any
pitfalls to this approach?

I ask as I have about 3 such libraries to keep track of and
they're all large with a lot of changes involved in the porting
not to mention different EOL styles from the different
vendors...!

Best Wishes,

~Pev

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 7 13:01:19 2006

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