Author: julianfoad
Date: Thu Nov 24 14:50:56 2011
New Revision: 1205852
URL: http://svn.apache.org/viewvc?rev=1205852&view=rev
Log:
* subversion/libsvn_client/merge.c
(IS_OPERATIVE_NOTIFICATION): Document here at definition ...
(notification_receiver): ... rather than here at point of use. Initialize
the variable in just one place.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1205852&r1=1205851&r2=1205852&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Nov 24 14:50:56 2011
@@ -2727,6 +2727,7 @@ find_nearest_ancestor(const apr_array_he
}
+/* Is the notification the result of a real operative merge? */
#define IS_OPERATIVE_NOTIFICATION(notify) \
(notify->content_state == svn_wc_notify_state_conflicted \
|| notify->content_state == svn_wc_notify_state_merged \
@@ -2743,7 +2744,7 @@ notification_receiver(void *baton, const
apr_pool_t *pool)
{
notification_receiver_baton_t *notify_b = baton;
- svn_boolean_t is_operative_notification = FALSE;
+ svn_boolean_t is_operative_notification = IS_OPERATIVE_NOTIFICATION(notify);
const char *notify_abspath;
/* Skip notifications if this is a --record-only merge that is adding
@@ -2755,11 +2756,9 @@ notification_receiver(void *baton, const
&& notify->action != svn_wc_notify_merge_record_info_begin))
return;
- /* Is the notification the result of a real operative merge? */
- if (IS_OPERATIVE_NOTIFICATION(notify))
+ if (is_operative_notification)
{
notify_b->nbr_operative_notifications++;
- is_operative_notification = TRUE;
}
/* If the node was moved-away, use its new path in the notification. */
