Merge a Branch into Trunk

Question

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

User · Answer

The syntax is wrong  it should instead be  svn merge  lt what the range  gt   lt from your dev branch  gt   lt to trunk trunk local copy  gt

User · Answer

Your svn merge syntax is wrong   You want to checkout a working copy of trunk and then use the svn merge --reintegrate option     pwd  home user project-trunk    svn update     make sure the working copy is up to date  At revision  lt N gt      svn merge --reintegrate   project branches branch 1 --- Merging differences between repository URLs into      U    foo c U    bar c  U          build  test  verify         svn commit -m  Merge branch 1 back into trunk   Sending          Sending        foo c Sending        bar c Transmitting file data    Committed revision  lt N 1 gt     See the SVN book chapter on merging for more details     Note that at the time it was written  this was the right answer  and was accepted   but things have moved on   See the answer of topek  and http   subversion apache org docs release-notes 1 8 html auto-reintegrate

User · Answer

Do an svn update in the trunk  note the revision number   From the trunk   svn merge -r lt revision where branch was cut gt   lt revision of trunk gt  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

User · Answer

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

[svn] Merge a Branch into Trunk

Examples related to svn

Examples related to version-control

Examples related to merge