subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1348757 - /subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
Date Mon, 11 Jun 2012 09:05:08 GMT
Author: hwright
Date: Mon Jun 11 09:05:08 2012
New Revision: 1348757

URL: http://svn.apache.org/viewvc?rev=1348757&view=rev
Log:
On the ev2-export branch:

* subversion/libsvn_client/commit_util.c
  (do_item_commit): Remove a commented out conditional, and replace it with a
    comment.  Adjust indents.

Modified:
    subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c

Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c?rev=1348757&r1=1348756&r2=1348757&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c Mon Jun 11 09:05:08
2012
@@ -1576,15 +1576,13 @@ do_item_commit(svn_client_commit_item3_t
       return SVN_NO_ERROR;
     }
 
-/*  if ((item->state_flags & SVN_CLIENT_COMMIT_ITEM_PROP_MODS) ||
-        (item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD))*/
-    {
-      if (item->path)
-        SVN_ERR(svn_wc_prop_list2(&props, ctx->wc_ctx, item->path,
-                                  scratch_pool, scratch_pool));
-      else
-        props = apr_hash_make(scratch_pool);
-    }
+  /* Fetch our props.  Whether we send them or not, we need them to determine
+     how to detranslate this file. */
+  if (item->path)
+    SVN_ERR(svn_wc_prop_list2(&props, ctx->wc_ctx, item->path,
+                              scratch_pool, scratch_pool));
+  else
+    props = apr_hash_make(scratch_pool);
 
   if ((kind == svn_node_file)
       && (item->state_flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS))



Mime
View raw message