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

Re: When is a branche necessary?

From: Miha Vitorovic <mvitorovic_at_nil.si>
Date: 2006-11-17 14:20:33 CET

Hi Tremal,

I think in your case svn:externals would be best suited. But you would
have to reorganize the code a little (becausesvn:externals only work with

You would have to separate the source code from the conf files. Then you
would do all your development on the trunk, with your default conf files.
For the clients you would create branches with only the conf files, and
svn:externals pointer to the code from the trunk. Please read the svn book
on how to use svn:externals. Also test things out before doing anything.

That way, if you run update on the branch, it gets the latest version of
the code from the trunk, but you would not be able to change the sorce
code from the branch. It would have to be done on the trunk.

Best ergards,

  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
"Tremal Naik" <tremalnaik@gmail.com> wrote on 17.11.2006 13:14:56:
> Hello,
> we've recently switched to Subversion a Version Control, we where
> using Source Safe before...
> The project in SS was organized as a main line of developement with
> all our source code (the "trunk") and some different projects for the
> different clients with only the small changes in the few configuration
> files. So, no source code in those "branches", only a few conf files.
> This was really useful because we were able to develop in the "trunk"
> only and at build time a script was building code on the trunk and at
> the end it overwrote the conf files with the client's before packaging
> Now I moved the main project into the newSvnProject/trunk/src and then
> I created the different branches for the clients:
> newSvnProject/branches/ClientA/src...
> newSvnProject/branches/ClientB/src...
> I switched to those clients in turn, overwrote the few conf files and
> committed. OK
> But now, I have to remember to syncronize my branch with the trunk
> changes before I build the code for, say, client A. Isn't this a
> complication? It is a waste of time, because a developer must manually
> merge the changes before a build. How do you solve this? Can I
> automate the process somehow? Another idea would be: build on the
> trunk always and then include the configuration files from the branch,
> but it looks different form the suggested use case.
> thanks for your suggestions
> -- 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 17 14:21:30 2006

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