I am using SVN 1.2.3 for some weeks now and it's quite a cool software, compared to that VSS thing we had before... ;-)
Using the svn merge command was new for me (VSS isn't able to merge complete trees but only single files), but I have learned it. I think I have understood how it works now:
- I'm using "svn --stop-on-copy log" to get the begin of the branch (in my sample: 21).
- I'm using "svn -r21:HEAD svn://x/branches/foo myworkspace" to merge everthing from the changes in the branch into myworkspace.
This works well and I have no understanding problem with that.
But now I want to do the same in Subclipse. So first, I was scared that I cannot find something like "--stop-on-copy". Okay, so I just clicked on release 21 (since I knew that from doing stop-on-copy above). But the merge dialog now shows "20", not "21". Actually, when now clicking "merge", I won't work -- it tells me it cannot copy on itself (sure it cannot -- it tries to create the branch another time at the same place, since this is what in 20 happened and that is why stop-on-copy told me that 21 is the correct release). Indeed the SVN log shows that Subclipse tries using -r20:HEAD but not -r21:HEAD as I wanted it to do.
So why is Subclipse not using the revision I marked but decreases that number? I don't understand that behaviour and actually experienced that using the manual command is line easier than to use Subclipse's merge dialog...?!
The confused Markus
Received on Tue Sep 6 18:03:18 2005