Merge two branch revisions using Subversion

by

The process is as follows:

  1. Establish a working copy of branch B (svn checkout http://branch-b)
  2. Merge changes from branch A into working copy of B (svn merge -r 10:HEAD http://branch-a .)
  3. Commit (after resolving conflicts) working copy B to branch b (svn commit)

Check the man page (help file) for svn merge semantics. It shows you that svn merge always dumps the results into a working copy.

Check out the SVNBook for all the details.

More Related Contents:

  1. svn commit error [closed]
  2. How do I migrate an SVN repository with history to a new Git repository?
  3. What do “branch”, “tag” and “trunk” mean in Subversion repositories?
  4. Pushing an existing Git repository to SVN
  5. SVN: Is there a way to mark a file as “do not commit”?
  6. What are the pros and cons of the SVN plugins for Eclipse, Subclipse and Subversive? [closed]
  7. Retract accidental checkin
  8. Do I really need version control? [closed]
  9. How does Git solve the merging problem? [closed]
  10. Getting the last revision number in SVN?
  11. Why is branching and merging easier in Mercurial than in Subversion?
  12. How to have ‘git log’ show filenames like ‘svn log -v’
  13. How to checkout a specific Subversion revision from the command line?
  14. Is git-svn dcommit after merging in git dangerous?
  15. How do I ‘svn add’ all unversioned files to SVN?
  16. Common Types of Subversion Hooks
  17. To put the prefix ? to codes by Git/SVN
  18. Are subversion externals an antipattern?
  19. SVN Repository Search [closed]
  20. How can I keep the original file [commit] timestamp on Subversion?
  21. Is there a Subversion Checkout Hook or something similar?
  22. One SVN repository or many?
  23. How to configure a HTTP proxy for svn
  24. Delete file with all history from svn repository
  25. How do I create a branch?
  26. How can I view all historical changes to a file in SVN
  27. How do you branch and merge with TortoiseSVN? [closed]
  28. How can I force subversion to commit an unchanged file?
  29. SVN Mergeinfo properties on paths other than the working copy root
  30. Moving SVN repositories data with history as subfolders into another repository

Leave a Comment