Merge with Subversion

Question

I have a connecting line that contains the current release code with various bug fixes in it and a branch that contains various new functions for the next version of the system. I am trying to combine bug fixes with a trunk in a branch that is ready for testing, but I am encountering some problems.

I use AnkhSVN and choose the option "Combine a series of changes." Two issues are presented:

• "No pending changes"
• "No children switching"

I have no pending changes. Could this be a problem with other users having uncommitted changes?

Answer 1

“Without any change” usually means that there are pending changes. It may happen that either a working working copy triggers a message, or that there are no incomplete changes in the pending changes. To check this run:

svn status -qc:\path\to\workingcopy 

“Without switched children” means that you have a working copy with switching, this means that at least one directory is “connected” to a different branch in the working copy than to the root directory of the working copy. To fix this, you need to switch the working copy root back to the branch again. Unfortunately, AnkhSVN does not allow you to do this (yet). You can run the command line client something like this:

 svn switch <reposurl>/branches/correctbranch c:\path\to\workingcopy 

Answer 2

One option — your working copy — is a trunk.