<p>I've used subversion for a  while, and used the svnmerge.py script for a while in my old job to manage merges between branches. I believe Subversion 1.5 is now out, and was supposed to have some branch / merge management system integrated with it.</p>

<p>So, can someone give me a quick overview of how to track merges in a branch with Subversion 1.5? Are there any pitfalls with using this support? Do I need to ensure all the team upgrades to 1.5 before using this support?</p>

[{'answer_id': 45978, 'author': 'Chris Zwiryk', 'author_id': 734, 'author_profile': 'https://Stackoverflow.com/users/734', 'pm_score': 3, 'selected': True, 'text': '<h3>Usage</h3>\n\n<p>Merge tracking is managed by the client and stored in a property (<a href="http://subversion.tigris.org/merge-tracking/design.html" rel="nofollow noreferrer">svn:mergeinfo</a>).</p>\n\n<p>To use merge tracking you just merge as usual but without the revision range:</p>\n\n<pre><code>svn merge trunkURL\n</code></pre>\n\n<p>The client will take care of reading the properties to see what revision(s) need to be merged in and then update the properties with the newly-merged revision(s).</p>\n\n<p><a href="http://blog.red-bean.com/sussman/?p=92" rel="nofollow noreferrer">Here</a> is a pretty basic overview of the process.</p>\n\n<h3>Pitfalls, etc.</h3>\n\n<p>I personally haven\'t run into any problems with merge tracking, but my usage of the feature has been pretty light.</p>\n\n<h3>Upgrading</h3>\n\n<p>There are two upgrades you\'ll need to do to get merge tracking:</p>\n\n<ol>\n<li>Server: Your server <strong>must</strong> be running 1.5 to get merge tracking support.</li>\n<li>Client: You can use a 1.x client against a 1.5 server, <strong>but you won\'t get merge tracking.</strong></li>\n</ol>\n\n<p>Just upgrade everyone.</p>\n'}, {'answer_id': 46154, 'author': 'Ishmaeel', 'author_id': 227, 'author_profile': 'https://Stackoverflow.com/users/227', 'pm_score': 1, 'selected': False, 'text': '<p>An addition to Chris\'s post:</p>\n\n<p>You may also have to upgrade the repository itself, if you run into "Retrieval of mergeinfo unsupported" messages. The command to run on the server to do this is,</p>\n\n<pre><code>svnadmin upgrade REPOS_PATH\n</code></pre>\n\n<p>where REPOS_PATH is the local path to your repository of course.</p>\n'}, {'answer_id': 240410, 'author': 'Hugo', 'author_id': 972, 'author_profile': 'https://Stackoverflow.com/users/972', 'pm_score': 0, 'selected': False, 'text': "<p>If you've built your repository with the ~ svn-merge.py command you can upgrade your repository to use svn native merge tracking with the XXX command.</p>\n"}]
['https://Stackoverflow.com/questions/45941', 'https://Stackoverflow.com', 'https://Stackoverflow.com/users/797/']