Marc Eggenberger wrote:
> 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.
Merging has caused some confusion and as a result we have improved the
merge dialog and the doc to make it all clearer. Unfortunately those
improvments won't make it into the 1.1.4 bugfix release, but they will
be in the 1.2 release due late April, early May.
To understand how merging works you should read the online version of
the subversion book. The chapter on merging has been significantly
improved recently.
Firstly, the merge takes place in your working copy, not directly in the
repo. You would want to review your changes before committing them. So
your WC needs to be switched to the branch which will receive the
changes, ie. 1.1.
What you want to do is merge a range of revisions from 1.0 into 1.1. The
To and From fields specify that range, but there is a gotcha. Because
merging applies a diff (read the SVN book to understand this), if you
want to merge the changes in revisions N to M, you need to specify
From=N-1 and To=M
Example:
Merge revisions 123-127 from 1.0 into 1.1
Switch WC to 1.1
Merge from:
http://myserver/repos/UniqueID/UserWebInterface/branches/1.0 rev 122
Merge to:
http://myserver/repos/UniqueID/UserWebInterface/branches/1.0 rev 127
The results of the merge are now in your 1.1 working copy, and you can
check that everything works, then commit.
Alternatively, if you want to try the nightly build you will find that
the interface is more intuitive, and the documentation improved. You
still end up doing the same thing, it is just more obvious how to get
there.
Simon
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Mar 24 12:03:10 2005