Hello,
I'm having a couple of issues using subclipse to merge:
I have the following structure:
/project/trunk/proj
/project/branches/proj
I created a branch /project/branches/mybranch from /project/trunk/proj.
I switched, made some changes and committed them. I switched back to
/project/trunk/proj and now I'm trying to merge. I select team-merge and
in my from url, I have:
/project/branches/mybranch. In the revision I hit show log and select
the revision where I created my branch. It shows 25. I select 25 and hit
ok. In the box it has filled in 24.
Why is it not 25? Also in the TO revision, it changed from head to 25.
There where no differences between 24 and 25, ever it seems because 24
isn't on my branch.
When I click dry run or merge, I get the following error:
merge --dry-run -r24:HEAD
http://sv1/svn/stc/supplementaldata/branches/brianBranch
E:/STC/workspace/supplementaldata
Invalid filesystem path syntax
svn: REPORT request failed on '/svn/stc/!svn/vcc/default'
svn: Cannot replace a directory from within
The same revision behavior happens with turtoisvn except I don't get the
error. I noticed that the box that says: The result of the merge is
stored at working copy at: has the wrong folder. This is showing one
folder on my drive above the /project (ie workspace, not
workspace/project.) In turtoise, this shows the correct folder.
So my questions are:
Why does it change the from revision to 1 less than the one I chose?
Why does it automatically change the to revision to 1+the from revision?
Why the exception? Did I do something wrong?
Thanks for the help. I really want to use subversion, but we are heavily
dependant on eclipse, as such this plugin is critical to our successful
convertion from cvs.
Received on Wed Oct 12 05:22:04 2005