http://jennyandlih.com/note-type/tech/troubleshooting The taxonomy view. en http://jennyandlih.com/different-repository-root-its-parent <p>Fairly new to working with branches in svn, I'd been merging files from trunk to branch like this for some time:<br /> <div class="codeblock"><code>jenny&gt; svn merge -c 1145 svn+ssh://shia/home/svn/trunk/working/html/drupal5<br />D&nbsp;&nbsp;&nbsp; sites/all/themes/custom_garland</code></div></p> <p>Imagine my confusion when all of a sudden, for no obvious reason, a merge fails with this error:<br /> <div class="codeblock"><code>jenny&gt; svn merge -c 1142 svn+ssh://shia/home/svn/trunk/working/html/drupal5<br />svn: The URL &#039;svn+ssh://shia/home/svn/trunk/working/html/drupal5/sites/all/modules/jquery_update&#039; has a different repository root than its parent</code></div></p> <p><a href="http://jennyandlih.com/different-repository-root-its-parent">read more</a></p> http://jennyandlih.com/different-repository-root-its-parent#comments Subversion Troubleshooting Mon, 10 Mar 2008 04:33:07 -0600 jenny 479 at http://jennyandlih.com