I created a branch like this
svn copy svn+ssh://foo.bar/svn/myproject/trunk svn+ssh://foo.bar/svn/myproject/branches/feature-x
Then I went on to check the working copy of my branch in another directory.
Since this is a feature branch, I would like to keep it in sync with the trunk. According to the SVN book, it should be as simple as
svn merge svn+ssh://foo.bar/svn/trunk
from my working copy directory.
However, it does not work. I do not know exactly what he is trying to do, but he seems to be trying to combine all the changes that have ever been tied to the trunk. Instead, I expected him to try to merge the changes that happened to the chest after I made the branch.
If i try
svn propget svn:mergeinfo .
from my working copy, I get nothing. If I understand correctly, I should see something about which versions are available for merging.
I am using svn v1.6.5
As a job, at the moment I'm starting to write
svn info
.
svn merge -r xxxx:HEAD svn+ssh://foo.bar/svn/trunk .
xxxx .
, svn- , .