Author: julianfoad
Date: Mon Dec 10 16:28:34 2012
New Revision: 1419560
URL: http://svn.apache.org/viewvc?rev=1419560&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_working_file): Update a comment.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1419560&r1=1419559&r2=1419560&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Dec 10
16:28:34 2012
@@ -247,8 +247,8 @@ update_working_file(svn_skel_t **work_it
old_version->props, old_version->props,
actual_props, propchanges,
scratch_pool, scratch_pool));
- /* ### TODO: Make a WQ item in WORK_ITEMS to set new_actual_props ... */
- /* ### Not a direct DB op like this... */
+ /* Install the new actual props. Don't set the conflict_skel yet, because
+ we might need to add a text conflict to it as well. */
SVN_ERR(svn_wc__db_op_set_props(db, local_abspath,
new_actual_props,
svn_wc__has_magic_property(propchanges),
