RE: Merge question

:

> 1. Take our changes from 2591 to 3020 and merge that
> into URL/tags/11v1.
>
> 2. Take the changes from 2591 to 11v1 and merge into revision 3020.

:

You forget the third option:

3) Take the changes from 10v1 (?) to 11v1 and merge into rev 3020 (I think you mean head):

cd ~
rm -rf src
svn co URL/trunk/src
cd src
svn merge --ignore-ancestry URL/tags/10v1/src URL/tags/11v1/src .

Of course this means that you need to have the entire 10v1 in svn and 11v1 as a delta. The way to do this is to import 10v1 in the usual way and use svn_load_dirs.pl to create the delta. Soemthin like this:

(The directories ./10v1 and ./11v1 contains the source as delivered from the vendor)

svn import ./10v1 URL/vendor/current
svn copy URL/vendor/current URL/vendor/10v1 /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl -v -t ./11v1 URL/vendor/current .
svn copy URL/vendor/current URL/vendor/11v1

(I used a vendor branch, replace with tags if that's the way you prefer this)

 -Frode

--
^ Frode Tennebø             | email: Frode.Tennebo_at_saabgroup.com ^
| SAAB Microwave Systems AS | Isebakkeveien 49                   |
| N-1788 Halden             | Phone: +47 45 24 99 39             |
| with Standard.Disclaimer; use Standard.Disclaimer;             |
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org