Re: Problem merging changes from Branches to Trunk

On 10/01/2008, B. Smith-Mannschott <benpsm_at_gmail.com> wrote:
> If you read Hielke's description above, you may notice that the you're
> doing it differently. Here's what you are asking tortoisesvn to do:
>
> "Please make the changes necessary to get [FROM] the head revision of
> the trunk [TO] the head revision of the branch to my working copy (of
> the trunk)."
>
> This is precisely what subversion has done: It has applied the
> necessary changes to make your working copy of the trunk identical to
> the branch. This is almost certainly not what you want.
>
>
> What Hielke asking is quite different.
>
> "Please make the changes necessary to get [FROM] revision 1 of branch
> A [TO] revision 7 of branch A to my working copy (of branch B)."

That's quite a nice description of how subversion sees the merge. One
for the docs I think :-)

Simon

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