Re: Merging problem

Thomas Sturgeon wrote:
> I have a repository with directories A and B.
>
> I want to merge A is a repository revision 2 and B is at repository
> revision 4.
>
> I want to checkout A, then merge A and B into the working copy.
>
> How do you I do this with TortoiseSVN? (or SVN for that matter)
>
> Every time I try to use the merge function, it ends up deleting the only
> directory under either A or B, then just adding all of the files and
> directories for entire B directory.
>
> B is the latest vendor’s version of the software.
>
> A is my version that I started modifying based on the last release from
> the vendor.

Your description is rather vague, but it sounds as if you should be
looking at using vendor branches, which are described in the Subversion
book:
<http://svnbook.red-bean.com/en/1.1/ch07s05.html>

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
--