"Aloys Oberthür" <aloys.oberthuer@gmx.net> wrote on 02/17/2005 05:39:53
AM:
> -The branch was created with a copy command in the SVN-perspective,
revision
> number is 11 before creating the branch, thus 12 after copy
> -Next I switch to the branch in Java-perspective
> -I make changes and commit them until I have revision 16
> -Now I switch back to trunk and am back at revision 11
> -I use Team/Merge and use standard for to: (HEAD revision) and from is:
> URL/branches/SomeBranch/EclipseProjectName (HEAD)
>
> and what I get is revision 16 but not the changes I made to the branch,
I
> have the same file I started with, the trunk-version. What I do not
> understand too is that after switching back to the trunk-version I see I
got
> revision 16, not 11 which I would have suspected??
>
>
> There must be something I misunderstood, but I cannot figure out what. I
> added the (important) log-messages of Subclipse for a more detailed view
of
> what happened. Btw. does it matter wether I commit on the level of the
> project or on the level of project/src.
When you are doing a merge, you need to supply the URL and revision range
that contain the changes you want to merge. In your case, you should be
entering a from revision of 12, since that is when the branch was created,
and a To revision of HEAD. Subversion will then calculate the changes
that occurred in that range and apply them to your WC.
Since you supplied the same URL and revision for both the From and To, it
is essentially a no-op. As there would not be any differences between the
two.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Fri Feb 18 00:20:22 2005