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

Re: Question on branching the right way

From: Sascha Herpers <herpers_at_wiso.uni-koeln.de>
Date: 2006-04-05 15:58:03 CEST


> It sounds like you're having the problem described in this part of the book. Have a look at this and see if it fixes your problem:
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.wholebr
if I understood that chapter correctly, it describes the opposite
situation, where the private branch (which is my custom version) is
merged into the trunk.

That situation differs from mine in two ways:
1) I want to merge the trunk into the branch (main version --merge
into-> custom version)
2) The described version of the above chapter assumes, that the branched
out version exists only for a certain amount of time until the bugfix or
feature testing is done. At that point the versions are merged and the
branch ceases to exist.
In my setting the branch will exist until the end of time (so to say).
You can picture it this way, that the main version is a product version
for every customer and the custom (branched) version has an additional
feature, that has been implemented for only one single customer. All I
want to accomplish is, that the parts of these versions, that are the
same, stay in sync.


    Sascha Herpers
    Universität zu Köln
    Seminar für Supply Chain Management und Produktion
    50923 Köln
    E-Mail: herpers@wiso.uni-koeln.de
    Tel.:   (0221) 4 70 - 37 40
    Fax:    (0221) 4 70 - 51 40
    WWW:    http://www.scmp.uni-koeln.de
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Apr 5 15:57:07 2006

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