Author: rhuijben
Date: Tue May 3 11:23:44 2011
New Revision: 1099012
URL: http://svn.apache.org/viewvc?rev=1099012&view=rev
Log:
Following up on r1091107 (and some earlier changes), update the content_state
variable properly on obstructed and shadowed files.
Found by: gstein
* subversion/libsvn_wc/update_editor.c
(close_file): Make sure content_state is set for obstructions and shadowed
nodes. The new value is what it would be set to before r1091107.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1099012&r1=1099011&r2=1099012&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue May 3 11:23:44
2011
@@ -3746,7 +3746,13 @@ close_file(void *file_baton,
scratch_pool);
}
else
- install_pristine = FALSE;
+ {
+ install_pristine = FALSE;
+ if (fb->new_text_base_sha1_checksum)
+ content_state = svn_wc_notify_state_changed;
+ else
+ content_state = svn_wc_notify_state_unchanged;
+ }
if (install_pristine)
{
@@ -3831,6 +3837,11 @@ close_file(void *file_baton,
all_work_items = svn_wc__wq_merge(all_work_items, work_item,
scratch_pool);
+
+ if (fb->new_text_base_sha1_checksum)
+ content_state = svn_wc_notify_state_changed;
+ else
+ content_state = svn_wc_notify_state_unchanged;
}
/* ### NOTE: from this point onwards, we make several changes to the
