Re: Help with Vendor branches/releases

On Mon, Nov 26, 2007 at 12:00:55PM +0000, Nathan Watson-Haigh wrote:
> So the current code in trunk/modules/module1/ is based on v1.2.12 of
> the vendor code and contains our own changes.

OK.

> Unfortunately, the history no
> longer exists for the changes made to the v1.2.12 code (I think due to
> migrating from CVS).

I don't get what you want to achieve and where you are starting from.

Isn't the 1.2.12 code already on the vendor_branch?

Or is there some other version sitting on the vendor branch?
And you want to retroactively recreate the pristine 1.2.12 version
on your vendor branch? In this case, what do you think should happen
to the code that currently sits on the vendor branch, if any?

Or is the vendor branch empty?

> So if I:
> 1) Load v1.2.12 vendor code into the vendor_branch and tag it using
> svn_load_dirs.pl.
>
> 2) svn copy the 1.2.12 tag to trunk/modules/module1/

The point of the vendor branch is simply to allow you to

        a) create meaningful diffs containing all or a selection
           of your changes to upstream code
        b) be able to relatively easily track what changes are
           made upstream and merge those changes into your code base
           if you want/need them

Which of these do you want to achieve by importing unmodifed 1.2.12
code into the vendor branch and then *copying* that to your trunk?
Especially given that your trunk seems to already contain the upstream
1.2.12 code?

> 3) make modifications and file moves in trunk/modules/module1/

If you can avoid moving files around, don't do it.
Merging new upstream changes into your trunk will become much
harder if you do this.

-- 
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