svn commit: r1501058 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_delta/compat.c

[sv...@apache.org]

Author: svn-role
Date: Tue Jul  9 04:00:05 2013
New Revision: 1501058

URL: http://svn.apache.org/r1501058
Log:
Merge r1498885 from trunk:

 * r1498885
   Correctly initialize the node kind in the Ev2 shims' change table.
   Justification:
     Fixes a bug introduced bu the svn_kind_t -> svn_node_kind_t merge
     from r1455559, making the shims work again.
   Notes:
     I [brane] realise that this is an unusual backport request;
     the motivation is to make the JavaHL extensions backported to the
     javahl-1.8-extensions branch work with stock 1.8.x binary distros.
     Incidentally, that backport will serve as a real-life test of the
     Ev2 API, as that is what JavaHL exposes.
   Votes:
      +1: brane, gstein, stsp

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_delta/compat.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1498885

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501058&r1=1501057&r2=1501058&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:00:05 2013
@@ -120,20 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1498885
-   Correctly initialize the node kind in the Ev2 shims' change table.
-   Justification:
-     Fixes a bug introduced bu the svn_kind_t -> svn_node_kind_t merge
-     from r1455559, making the shims work again.
-   Notes:
-     I [brane] realise that this is an unusual backport request;
-     the motivation is to make the JavaHL extensions backported to the
-     javahl-1.8-extensions branch work with stock 1.8.x binary distros.
-     Incidentally, that backport will serve as a real-life test of the
-     Ev2 API, as that is what JavaHL exposes.
-   Votes:
-      +1: brane, gstein, stsp
-
  * r1491816, r1494089
    Add two additional options to interactive file merge.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_delta/compat.c?rev=1501058&r1=1501057&r2=1501058&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_delta/compat.c Tue Jul  9 04:00:05 2013
@@ -218,6 +218,7 @@ locate_change(struct ev2_edit_baton *eb,
   change = apr_pcalloc(eb->edit_pool, sizeof(*change));
   change->changing = SVN_INVALID_REVNUM;
   change->deleting = SVN_INVALID_REVNUM;
+  change->kind = svn_node_unknown;
 
   svn_hash_sets(eb->changes, relpath, change);