Author: rhuijben
Revision: 1357388
Modified property: svn:log
Modified: svn:log at Wed Jul 4 20:17:33 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Jul 4 20:17:33 2012
@@ -1,3 +1,6 @@
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_ACTUAL_TREE_CONFLICT,
STMT_SELECT_ACTUAL_CHANGELIST): Remove unused statements.
+
+ (STMT_DELETE_ACTUAL_NODE_WITHOUT_CONFLICT): Also keep the node
+ when there is a new-style conflict skel.
