I'm facing a peculiar problem with SVN merge. I want to merge from a dev branch to trunk.
We have multiple dev branches cut off the trunk at the same time.
I'm merging one of those branches to trunk with this command:
svn merge trunk branch_1
I see changes that are not part of this branch, getting merged into trunk. What am I doing wrong ?
SVN Version :
Subversion command-line client, version 1.6.16-SlikSvn-tag-1.6.16@1076804-WIN32.
This question is related to
svn
version-control
merge
Do an svn update in the trunk, note the revision number.
From the trunk:
svn merge -r<revision where branch was cut>:<revision of trunk> svn://path/to/branch/branchName
You can check where the branch was cut from the trunk by doing an svn log
svn log --stop-on-copy
The syntax is wrong, it should instead be
svn merge <what(the range)> <from(your dev branch)> <to(trunk/trunk local copy)>
If your working directory points to the trunk, then you should be able to merge your branch with:
svn merge https://HOST/repository/branches/branch_1
be sure to be to issue this command in the root directory of your trunk
Source: Stackoverflow.com