svn commit: r987530 - in /subversion/trunk/subversion/svnrdump: load_editor.c svnrdump.c

[ar...@apache.org]

Author: artagnon
Date: Fri Aug 20 14:56:32 2010
New Revision: 987530

URL: http://svn.apache.org/viewvc?rev=987530&view=rev
Log:
* subversion/svnrdump/svnrdump.c
  (load_cmd): A closer look shows that r987513 doesn't do what it
  promises. Revert it.

* subversion/svnrdump/load_editor.c
  (drive_dumpstream_loader): Add a TODO note about trying to find out
  if we can set the revprops.


Modified:
    subversion/trunk/subversion/svnrdump/load_editor.c
    subversion/trunk/subversion/svnrdump/svnrdump.c

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=987530&r1=987529&r2=987530&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri Aug 20 14:56:32 2010
@@ -539,6 +539,10 @@ drive_dumpstream_loader(svn_stream_t *st
   struct parse_baton *pb;
   pb = parse_baton;
 
+  /* ### TODO: Figure out if we're allowed to set revprops before
+     ### we're too late and mess up the repository. svnsync uses some
+     ### sort of locking mechanism. */
+
   SVN_ERR(svn_ra_get_repos_root2(session, &(pb->root_url), pool));
   SVN_ERR(svn_repos_parse_dumpstream2(stream, parser, parse_baton,
                                       NULL, NULL, pool));

Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=987530&r1=987529&r2=987530&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Aug 20 14:56:32 2010
@@ -393,17 +393,6 @@ static svn_error_t *
 load_cmd(apr_getopt_t *os, void *baton, apr_pool_t *pool)
 {
   opt_baton_t *opt_baton = baton;
-  svn_boolean_t can_set_revprops = FALSE;
-
-  SVN_ERR(svn_ra_has_capability(opt_baton->session, &can_set_revprops,
-                                "commit-revprops", pool));
-  if(!can_set_revprops)
-    return
-      svn_error_create
-      (SVN_ERR_REPOS_DISABLED_FEATURE, NULL,
-       _("Repository has not been enabled to accept revision propchanges;\n"
-         "ask the administrator to create a pre-revprop-change hook"));
-
   SVN_ERR(load_revisions(opt_baton->session, opt_baton->url,
                          opt_baton->quiet, pool));  
   return SVN_NO_ERROR;