Vendor branches

I'm having some problems understanding how to get this to work correctly. My
apologies if I sound confused here.

We have a vendor product which we modify, combine with our own product, and
ship our stuff plus the changes in source to our customers. The vendor
product can exist at a number of different versions, updated about twice per
year, at our customers.

I can create a vendor subdirectory alongside my main trunk and apply the
vendor's updates to create (tagged?) versions 0, 1, 2, ... We then develop
our own product code under trunk. How do we handle putting our changes into
the vendor's code though? By branching it? And how do we then synchronize our
changes under trunk to the various versions that we're supporting at our
customers?

An alternative might be to regard the vendor product as trunk and apply our
changes (as branches?) to it. Each new version from them gets applied to a
tagged level and our changes get reworked. The question then is how do we
generate a shipment to our customers that just involves our original code plus
modifications?

ian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Nov 19 16:59:35 2007