subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1185387 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Mon, 17 Oct 2011 21:39:09 GMT
Author: stsp
Date: Mon Oct 17 21:39:08 2011
New Revision: 1185387

URL: http://svn.apache.org/viewvc?rev=1185387&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (scan_deletion_txn): When ignoring missing children, make sure to
    clear the moved_to_relpath output parameter, too, in case it was
    already set. Without this fix, it was possible to return from this
    function with a moved_to_relpath but without a moved_to_op_root_relpath,
    which violates an API promise of svn_wc__db_scan_deletion().

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1185387&r1=1185386&r2=1185387&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Oct 17 21:39:08 2011
@@ -10019,6 +10019,8 @@ scan_deletion_txn(void *baton,
                       svn_error_clear(err); 
                       moved_to_relpath = NULL;
                       moved_to_op_root_relpath = NULL;
+                      if (sd_baton->moved_to_relpath)
+                        *sd_baton->moved_to_relpath = NULL;
                       found_child = FALSE;
                     }
                   else



Mime
View raw message