"Markus Karg" <markus.karg@quipsy.de> wrote on 09/06/2005 09:55:47 AM:
> the online help doesn't provide an answer to my question. In r21, I
created a
> branch. Now I want to merge back all features of that branch into trunk.
So I
> switch to trunk, then go to merge. I open the log, click on the head,
hold
> shift, click on 21. Now everything between head and 21 (including) is
> selected. I shall result in svn merge -r21:HEAD. But when I come back
from the
> log view to the merge dialog, there is shown 20 and 29, which results in
svn
> merge -r20:29. And this will not work, since it tries to recreate the
copy
> command done in r20_to_r21. So, my problem is not that I'm not
understanding
> how merge works, but that I do not understand why I select 21 and the
dialog
> uses 20...?!
Actually, that is covered in the help. When you click the Show Log
dialog, you should select the revisions you want to merge. Since you do
not want to merge revision 21, you should not select it.
Here is a passage from the help relating to this:
"An important point to remember is that Merge is closely related to Diff.
The merge process works by generating a list of differences between two
points in the repository, and applying those differences to your working
copy. For example if you want to merge the changes made in revision N then
you have to compare revision N with revision (N-1). Novices often ask “Why
do I have to subtract 1 from the start revision.” Think of the underlying
Diff process and it will become clearer. To make this easier, when you use
Show Log to select a range of revisions to merge, Subclipse makes this
adjustment for you automatically."
So, when you select revision 21, we change it to 20 so that revision 21
will be included in the merge. This is the same as how it works in
TortoiseSVN.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Wed Sep 7 00:08:19 2005