Databases
StackOverflow2013
Postsdbo
POUsing TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POUsing TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?
    text
    copied!<p>I've been reading up on branching/merging with Subversion 1.5 using the excellent and free <a href="http://svnbook.red-bean.com/" rel="noreferrer">Version Control with Subversion</a> book. I think that I understand how to use the Subversion command line client to perform the actions that I need most often, which are:</p> <p><strong>Update Branch with Changes from Trunk</strong></p> <p>From the branch's working directory run: </p> <blockquote> <p>svn merge <a href="http://svn.myurl.com/proj/trunk" rel="noreferrer">http://svn.myurl.com/proj/trunk</a></p> </blockquote> <p><strong>Merge Branch into Trunk</strong></p> <p>From the trunk's working directory run:</p> <blockquote> <p>svn merge --reintegrate <a href="http://svn.myurl.com/proj/branches/mybranch" rel="noreferrer">http://svn.myurl.com/proj/branches/mybranch</a></p> </blockquote> <p>However, we are using TortoiseSVN 1.5 as our interface to Subversion. I would like to know how best to perform these operations with TortoiseSVN. The new dialog provides three different options on the main menu. </p> <ol> <li>Merge a range of revisions</li> <li>Reintegrate a branch</li> <li>Merge two different trees</li> </ol> <p>From what I can gather, TortoiseSVN always executes svn with the following syntax.</p> <blockquote> <p>svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH</p> </blockquote> <p>Additionally, reintegrate a branch often fails with a message stating that some targets have not been merged and so it cannot continue, and so I had to use option #3.</p> <p>My questions are:</p> <ol> <li>How do I use TortoiseSVN 1.5 to merge changes from the trunk to a branch?</li> <li>How do I use TortoiseSVN 1.5 to merge the branch to the trunk, with and without the reintegrate method?</li> <li>Which of the above options should I use for each, and why?</li> </ol> <hr> <p><strong>EDIT</strong></p> <p>Through "dry run" testing I have found that the command line Subversion operation</p> <blockquote> <p>svn merge <a href="http://svn.myurl.com/proj/trunk" rel="noreferrer">http://svn.myurl.com/proj/trunk</a></p> </blockquote> <p>is analogous to option #1 (Merge a Range of Revisions) in TortoiseSVN, as long as I leave the revision range blank.</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload