Author: philip
Date: Mon Apr 4 10:56:17 2011
New Revision: 1088552
URL: http://svn.apache.org/viewvc?rev=1088552&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
(STMT_CREATE_REVERT_LIST): Mark actual nodes that have tree conflicts
for notification.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1088552&r1=1088551&r2=1088552&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Mon Apr 4 10:56:17
2011
@@ -955,7 +955,9 @@ BEGIN
SELECT OLD.local_relpath,
OLD.conflict_old, OLD.conflict_new, OLD.conflict_working,
OLD.prop_reject,
- CASE WHEN OLD.properties IS NOT NULL THEN 1 ELSE NULL END;
+ CASE
+ WHEN OLD.properties IS NOT NULL OR OLD.tree_conflict_data IS NOT NULL
+ THEN 1 ELSE NULL END;
END;
DROP TRIGGER IF EXISTS trigger_revert_list_actual_update;
CREATE TEMPORARY TRIGGER trigger_revert_list_actual_update
@@ -967,7 +969,9 @@ BEGIN
SELECT OLD.local_relpath,
OLD.conflict_old, OLD.conflict_new, OLD.conflict_working,
OLD.prop_reject,
- CASE WHEN OLD.properties IS NOT NULL THEN 1 ELSE NULL END;
+ CASE
+ WHEN OLD.properties IS NOT NULL OR OLD.tree_conflict_data IS NOT NULL
+ THEN 1 ELSE NULL END;
END
-- STMT_DROP_REVERT_LIST_TRIGGERS
