You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/12/13 17:36:13 UTC
svn commit: r1421371 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: rhuijben
Date: Thu Dec 13 16:36:12 2012
New Revision: 1421371
URL: http://svn.apache.org/viewvc?rev=1421371&view=rev
Log:
Whitespace only change. No functional changes.
* subversion/libsvn_wc/props.c
(apply_single_mergeinfo_prop_change): Fix indentation.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1421371&r1=1421370&r2=1421371&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec 13 16:36:12 2012
@@ -921,18 +921,18 @@ apply_single_mergeinfo_prop_change(svn_w
set_prop_merge_state(state, svn_wc_notify_state_merged);
else
{
- /* We have base, WC, and new values. Discover
- deltas between base <-> WC, and base <->
- incoming. Combine those deltas, and apply
- them to base to get the new value. */
- SVN_ERR(combine_forked_mergeinfo_props(&new_val, old_val,
- working_val,
- new_val,
- result_pool,
- scratch_pool));
- apr_hash_set(actual_props, propname,
- APR_HASH_KEY_STRING, new_val);
- set_prop_merge_state(state, svn_wc_notify_state_merged);
+ /* We have base, WC, and new values. Discover
+ deltas between base <-> WC, and base <->
+ incoming. Combine those deltas, and apply
+ them to base to get the new value. */
+ SVN_ERR(combine_forked_mergeinfo_props(&new_val, old_val,
+ working_val,
+ new_val,
+ result_pool,
+ scratch_pool));
+ apr_hash_set(actual_props, propname,
+ APR_HASH_KEY_STRING, new_val);
+ set_prop_merge_state(state, svn_wc_notify_state_merged);
}
}
@@ -946,19 +946,19 @@ apply_single_mergeinfo_prop_change(svn_w
else if (! working_val) /* means !working_val && !base_val due
to conditions above: no prop at all */
{
- /* Discover any mergeinfo additions in the
- incoming value relative to the base, and
- "combine" those with the empty WC value. */
- svn_mergeinfo_t deleted_mergeinfo, added_mergeinfo;
- svn_string_t *mergeinfo_string;
-
- SVN_ERR(diff_mergeinfo_props(&deleted_mergeinfo,
- &added_mergeinfo,
- old_val, new_val, scratch_pool));
- SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_string,
- added_mergeinfo, result_pool));
- apr_hash_set(actual_props, propname, APR_HASH_KEY_STRING,
- mergeinfo_string);
+ /* Discover any mergeinfo additions in the
+ incoming value relative to the base, and
+ "combine" those with the empty WC value. */
+ svn_mergeinfo_t deleted_mergeinfo, added_mergeinfo;
+ svn_string_t *mergeinfo_string;
+
+ SVN_ERR(diff_mergeinfo_props(&deleted_mergeinfo,
+ &added_mergeinfo,
+ old_val, new_val, scratch_pool));
+ SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_string,
+ added_mergeinfo, result_pool));
+ apr_hash_set(actual_props, propname, APR_HASH_KEY_STRING,
+ mergeinfo_string);
}
else /* means working && base && svn_string_compare(working, base) */
@@ -968,17 +968,17 @@ apply_single_mergeinfo_prop_change(svn_w
else
{
- /* We have base, WC, and new values. Discover
- deltas between base <-> WC, and base <->
- incoming. Combine those deltas, and apply
- them to base to get the new value. */
- SVN_ERR(combine_forked_mergeinfo_props(&new_val, old_val,
- working_val,
- new_val, result_pool,
- scratch_pool));
- apr_hash_set(actual_props, propname,
- APR_HASH_KEY_STRING, new_val);
- set_prop_merge_state(state, svn_wc_notify_state_merged);
+ /* We have base, WC, and new values. Discover
+ deltas between base <-> WC, and base <->
+ incoming. Combine those deltas, and apply
+ them to base to get the new value. */
+ SVN_ERR(combine_forked_mergeinfo_props(&new_val, old_val,
+ working_val,
+ new_val, result_pool,
+ scratch_pool));
+ apr_hash_set(actual_props, propname,
+ APR_HASH_KEY_STRING, new_val);
+ set_prop_merge_state(state, svn_wc_notify_state_merged);
}
}