Troubleshooting

Different repository root than its parent

Fairly new to working with branches in svn, I'd been merging files from trunk to branch like this for some time:

jenny> svn merge -c 1145 svn+ssh://shia/home/svn/trunk/working/html/drupal5
D    sites/all/themes/custom_garland

Imagine my confusion when all of a sudden, for no obvious reason, a merge fails with this error:

jenny> svn merge -c 1142 svn+ssh://shia/home/svn/trunk/working/html/drupal5
svn: The URL 'svn+ssh://shia/home/svn/trunk/working/html/drupal5/sites/all/modules/jquery_update' has a different repository root than its parent

Syndicate content