You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/12 18:22:25 UTC
svn commit: r1337587 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Sat May 12 16:22:24 2012
New Revision: 1337587
URL: http://svn.apache.org/viewvc?rev=1337587&view=rev
Log:
Follow up to r1337579:
* subversion/libsvn_wc/conflicts.c
(resolve_conflict_on_node): Merge the prop reject remove work item with
other work queue items.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1337587&r1=1337586&r2=1337587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sat May 12 16:22:24 2012
@@ -284,8 +284,11 @@ resolve_conflict_on_node(svn_wc__db_t *d
if (resolve_props)
{
if (prop_reject_file != NULL)
- SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db, prop_reject_file,
- pool, pool));
+ {
+ SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db, prop_reject_file,
+ pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ }
else
resolve_props = FALSE;
}