SVN version 1.8.10 (r1615264), in Fedora 20.
I got above error when I try to merge a trunk to branch before I apply my
changes to the trunk from the branch.
I was able to check out the branch, modify the code and commit back to server
and update the branch to the latest reversion. The same is for the trunk. I
actually have looked at the server, all files\folders belong to me.
The followings are what I did:
1. create a branch called b1 in the branches directory from the trunk;
2. checkout to my dev machine and make some changes by adding a new file and a
new folder;
3. chechin the changes and commit;
4. do merge, and was asked to update the branch;
5. done update branch and then do merge again from my branch working directory
with the command:
$svn merge svn://192.168.0.9/myRepos/myProject/trunk
Then get above error.
My project is a Java project.
How to avoid this?
Thanks,
