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

vendor branches in same folders

From: UpperPark <rick.martin_at_upperparksolutions.com>
Date: Fri, 12 Aug 2011 16:49:02 -0700 (PDT)

I work in a development environment where 3rd party products from different
vendors are mixed into the same folders.
For example:

will have files from multiple vendor products.

I want to be able to have a vendor branch for each product and be able to
merge that into the trunk along with all the other files.
I'm having a difficult time getting this to work.

Either I'm getting files from one product into another product's branch or
the files from one product are deleted when merging another product, etc.

I tried to copy a product branch to the trunk but got an error about the
folder already existing.

When I set my working copy to trunk and tried to merge the product branch I
received errors regarding no ancestry even when checking the option to
ignore ancestry.

any pointer would be great. I've done this type of thing with other SCM
systems and am wondering if I'm just going about the whole thing wrong.


View this message in context: http://old.nabble.com/vendor-branches-in-same-folders-tp32254060p32254060.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-13 08:09:35 CEST

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

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