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

Suggestions for a branching strategy

From: Montag, Rob <rob_montag_at_milacron.com>
Date: 2006-01-23 15:21:27 CET

        I have found svn very easy to use after using PVCS for a long time, but now I have a situation with our development system that I haven't found a svn solution for.
        We maintain about a dozen different software versions for similar but different products. Many files are common between the different projects, and the different files are named the same but exist on different branches (so there are about a dozen branches). This is just fine until a change is made to a common file and that change must be ported across all the branches (which is fairly common). I'm looking for a method to automatically pick up those changes in the other branches without having to manually merge. This was done in PVCS by assigning multiple labels to the common files so, after a change was committed, checking out with ANY of the labels got you the change. Obviously, svn doesn't work like that so I'm looking for another solution that doesn't require manually merging all the branches.
        I have tried re-organizing the common files in a different branch and using svn:external properties to update them from any branch update, but that just isn't what I'm looking for. Thanks in advance for any other suggestions on how to ease the maintenance of so many parallel (but mostly common) branches.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 23 15:30:02 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.