Hello,
I cannot get the merge feature to work and suspect there is something I did
wrong.
So here is what I did:
Repository Layout is (with 'SubclipseTest' as project name)
URL/trunk/SubclipseTest/src/...
URL/branches/SomeBranch/SubclipseTest/src/...
-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.
Regards, Aloys Oberthuer
Log of Subclipse output, starting with branch creation:
copy file://localhost/e:/subversion/repositories/Sc01/trunk/SubclipseTest
file://localhost/e:/subversion/repositories/Sc01/branches/SomeBranch
switch
file://localhost/e:/subversion/repositories/Sc01/branches/SomeBranch/SubclipseTest
E:/Eclipse Workspaces/TryOut/SubclipseTest -rHEAD
At revision 13.
commit -m "branch commit.1" E:/Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Sending Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Transmitting file data ...
Committed revision 14.
commit -m "branch commit.2" E:/Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Sending Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Transmitting file data ...
Committed revision 15.
commit -m "branch commit.3 (4)" E:/Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Sending Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Transmitting file data ...
Committed revision 16.
switch file://localhost/e:/subversion/repositories/Sc01/trunk/SubclipseTest
E:/Eclipse Workspaces/TryOut/SubclipseTest -rHEAD
U E:/Eclipse
Workspaces/TryOut/SubclipseTest/src/subclipse/test/TestFrame.java
Updated to revision 16. ????
merge -rHEAD:HEAD
file://localhost/e:/subversion/repositories/Sc01/branches/SomeBranch/SubclipseTest
E:/Eclipse Workspaces/TryOut/SubclipseTest
Received on Thu Feb 17 21:39:53 2005