[TSVN] Problems with merging two trunks

Hi there.

I'm fairly new to SVN and TSVN but used CVS sometimes.

In my Softwareproject I created a trunk and a branches directory as
proposed in the documentation.
I have created a branch 1.0 for the first initial release and then a 1.1
branch for my development.

In the 1.0 branch I had to fix some bugs which I want now to merge into
the 1.1 branch. The 1.1 branch has several changes and commits and is
different from the 1.0 branch.

Whatever I tried til now didnt work. I thought I use the Merge Menu
Entry of TortoiseSVN and use this settings

From:
http://myserver/repos/UniqueID/UserWebInterface/branches/1.1
X Head Revision

To:
http://myserver/repos/UniqueID/UserWebInterface/branches/1.0
X Head Revision

But when I switch to the 1.1 revision the changes are not in that
branch.

What am I missing here? Any help.

Thanks for any hints,

Marc Eggenberger

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Mar 24 11:41:31 2005