Hello, I had a problem with committing changes after merging two branches of my project using TortoiseSVN. Here are details: I did a merge branch to trunk of project which I am working on. Project includes main repository and libraries joint to main repository as svn external (libraries are also branched) as subdirectory of project....
What is the difference between 'svnmerge' (alias svnmerge.py, the python script that comes with svn) and 'svn merge' (Subversion 1.5's native merge-tracking)? Which one do you recommend? ...
In my local Subversion working copy, I have a copy of trunk and of a code branch. I've made changes in the trunk, and want to copy these changes to my (currently clean) local copy of the branch. I know I can check in the code to trunk, then use svn merge to get the changes onto the branch, but is there some way of doing this without fir...
This is kind of similar to http://stackoverflow.com/questions/1601021/subversion-merge-has-different-repository-root-than - but appears to be a very different cause (especially as the answer for that question didn't resolve my problem). A while back, we swapped out the server where our SVN repositories are located - but we've been using...
I just did an svn merge from a branch to a trunk in my Eclipse IDE, and in the Merge Results view, there is this following icon: I am dying to know what it means. I have searched the entire Eclipse documentation and some relevant StackOverflow questions, but couldn't find anything. The CollabNet documentation about Merge Results Vie...
We have a SVN repository structure with feature branches, where we finally do a svn merge --reintegrate into the trunk. This usually works fine (so far we had about 200 feature branches reintegrated). Now, when trying svn merge --reintegrate, we received the following error message: svn: Reintegrate can only be used if revisions 94538 t...