Re: Help with Vendor branches/releases

On Mon, Nov 26, 2007 at 10:22:34AM +0000, Nathan Watson-Haigh wrote:
> Now, the questions I particularly have are:
> 1) Are my code changes and file rearrangement supposed to go on the
> vendor_branch?

They aren't supposed to go on the vendor branch.

You do not put your own changes onto the vendor branch.
The vendor branch is just supposed to mirror what the
vendor you are getting the code from is doing.

All your own work happens on "trunk", and you merge from
the vendor's code from the vendor branch into trunk.

So every time you get a new vendor release onto your vendor branch,
you merge the differences between the vendor's last release you've
merged and the new one into your trunk, sort out the conflicts,
and commit the result to your trunk.

Hope this helps,

-- 
Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner