subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1628762 - /subversion/trunk/subversion/libsvn_fs_fs/low_level.c
Date Wed, 01 Oct 2014 16:41:46 GMT
Author: stefan2
Date: Wed Oct  1 16:41:46 2014
New Revision: 1628762

URL: http://svn.apache.org/r1628762
Log:
* subversion/libsvn_fs_fs/low_level.c
  (read_change): Fix reporting of the "mergeinfo_mod" flag for changed
                 paths if the flag insn't actually stored in the repo.
                 We must explicitly initialize it to svn_tristate_unknown.

Found by: julianfoad

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/low_level.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.c?rev=1628762&r1=1628761&r2=1628762&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Wed Oct  1 16:41:46 2014
@@ -355,7 +355,9 @@ read_change(change_t **change_p,
     }
 
   /* Get the mergeinfo-mod flag if given.  Otherwise, the next thing
-     is the path starting with a slash. */
+     is the path starting with a slash.  Also, we must initialize the
+     flag explicitly because 0 is not valid for a svn_tristate_t. */
+  info->mergeinfo_mod = svn_tristate_unknown;
   if (*last_str != '/')
     {
       str = svn_cstring_tokenize(" ", &last_str);



Mime
View raw message