svn commit: r1714776 - /subversion/trunk/tools/dev/svnmover/ra.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Nov 17 13:20:28 2015
New Revision: 1714776

URL: http://svn.apache.org/viewvc?rev=1714776&view=rev
Log:
Make 'svnmover' return a friendly error message instead of failing an assertion
when no move-tracking metadata is found in the repository.

* tools/dev/svnmover/ra.c
  (branch_revision_fetch_info): Return a friendly error message when
    no move-tracking metadata is found.

Modified:
    subversion/trunk/tools/dev/svnmover/ra.c

Modified: subversion/trunk/tools/dev/svnmover/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/ra.c?rev=1714776&r1=1714775&r2=1714776&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/ra.c (original)
+++ subversion/trunk/tools/dev/svnmover/ra.c Tue Nov 17 13:20:28 2015
@@ -154,7 +154,14 @@ branch_revision_fetch_info(svn_branch__t
       SVN_ERR(write_rev_prop(ra_session, branch_info_dir, revision, value,
                              scratch_pool));
     }
-  SVN_ERR_ASSERT(value);
+  else if (! value)
+    {
+      return svn_error_createf(SVN_BRANCH__ERR, NULL,
+                               _("Move-tracking metadata not found in r%ld "
+                                 "in this repository. Run svnmover on an "
+                                 "empty repository to initialize the "
+                                 "metadata"), revision);
+    }
   stream = svn_stream_from_string(value, scratch_pool);
 
   SVN_ERR(svn_branch__txn_parse(&txn, repos, stream,