Re: Needed help at TortoiseSVN - Branch\Trunk Merge

On 11/12/2007, IT <IT@siano-ms.com> wrote:
> Hi,
>
> I am having problem merging local changes to my SVN repository.
>
> My SVN system is:
>
> - Apache Based. (2.0)
> - Resides on Windows Server.
> - SVN version 1.4.3 (Repositories first created on 1.4.0).
> - TortoiseSVN client - 1.4.5 - 32 bit, Windows. (Also tried from 1.4.0)
>
> The status is:
>
> A. Head branch is version A.
> B. Local Branch is version A + Changes = Version B.
> C. Head trunk is more updated from local trunk.
>
> What I need:
>
> I want to update the HEAD branch with my local branch changes AND
> updated HEAD trunk changes.
>
> My actions are:
>
> 1. SVN Update to my local branch. - No conflicts found.
> 2. SVN Commit to my local branch - to commit my changes.

So far so good. Now branch HEAD contains your local changes. Next step
is to merge in the changes from trunk.

> 3. SVN Merge:
> - From - http server URL of HEAD branch.
> - To - http server URL of HEAD trunk.
>

That is the problem. The command you entered makes your local branch
exactly like trunk HEAD, so it will discard your recent changes.

What you need to do is merge the changes made in trunk into your local branch.
From URL of trunk at revision where you made the branch
To (use 'From' URL) trunk at HEAD.

That will merge the range of changes made on trunk into your working
copy, which is checked out from the branch.

You need to make a note of which revisions you have merged in the
commit log message. Next time you merge from trunk, the 'From:'
revision will be the last one you merged here.

> My Problem is:

You didn't read the docs ;-)

Simon

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