Needed help at TortoiseSVN - Branch\Trunk Merge

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.
3. SVN Merge:
        - From - http server URL of HEAD branch.
        - To - http server URL of HEAD trunk.

My Problem is:

At the merge screen - after pressing DIFF to see the changes - there are
many DIFFS on files.

After pressing MERGE - the merge action is completed with no errors.
But some files showed at the DIFF report earlier - do NOT updated and
left untouched. (Even though they showed DIFF on the merge dialog
screen).

NOTE: I do not have local workspace of the HEAD trunk.

Why this is happening? Am I doing something wrong?

Please update me with your remarks and suggestion or if you have a
better "best practices" procedure.

It is very important to me - any suggestion will help.

Thank you for the help.

Rafi Abarjeel
Syverse LTD
it@siano-ms.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Dec 11 12:45:39 2007