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

Re: Vendor branches

From: Ian S. Worthington <ianworthington_at_usa.net>
Date: 2007-11-20 03:14:56 CET

Hi Andrew --

Thanks for that. Unfortunatly I've read it several times and can't understand
quite what I should do in my case!

ian

------ Original Message ------
Received: Tue, 20 Nov 2007 01:46:51 AM GMT
From: "Andrew Sasak" <andrew.sasak@gmail.com>
To: users@tortoisesvn.tigris.orgCc: ianworthington@usa.net
Subject: Re: Vendor branches

> On Nov 19, 2007 10:59 AM, Ian S. Worthington <ianworthington@usa.net>
wrote:
>
> > 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
> >
> >
> Try reading this:
> http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html
> (If I didn't still need to read that chapter myself, I may have tried to
> provide a more direct answer)
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Nov 20 03:15:10 2007

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.