You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2015/02/14 00:10:46 UTC
RE: svn commit: r1659553 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
> -----Original Message-----
> From: ivan@apache.org [mailto:ivan@apache.org]
> Sent: vrijdag 13 februari 2015 14:27
> To: commits@subversion.apache.org
> Subject: svn commit: r1659553 -
> /subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Author: ivan
> Date: Fri Feb 13 13:26:53 2015
> New Revision: 1659553
>
> URL: http://svn.apache.org/r1659553
> Log:
> Follow-up to r1658115: Formatting fix.
>
> * subversion/libsvn_wc/update_editor.c
> (add_directory): Fix indentation.
>
> 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_e
> ditor.c?rev=1659553&r1=1659552&r2=1659553&view=diff
> ================================================================
> ==============
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Feb 13 13:26:53
> 2015
> @@ -2124,7 +2124,7 @@ add_directory(const char *path,
> replacement. Let's install a better tree conflict. */
>
> SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL,
> - &move_src_op_root_abspath,
> + &move_src_op_root_abspath,
> eb->db,
> db->local_abspath,
> tree_conflict,
FYI: This indentation bug was on purpose to keep things within 80 characters.
Bert
Re: svn commit: r1659553 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Branko Čibej <br...@wandisco.com>.
On 14.02.2015 00:10, Bert Huijben wrote:
>> -----Original Message-----
>> From: ivan@apache.org [mailto:ivan@apache.org]
>> Sent: vrijdag 13 februari 2015 14:27
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1659553 -
>> /subversion/trunk/subversion/libsvn_wc/update_editor.c
>>
>> Author: ivan
>> Date: Fri Feb 13 13:26:53 2015
>> New Revision: 1659553
>>
>> URL: http://svn.apache.org/r1659553
>> Log:
>> Follow-up to r1658115: Formatting fix.
>>
>> * subversion/libsvn_wc/update_editor.c
>> (add_directory): Fix indentation.
>>
>> 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_e
>> ditor.c?rev=1659553&r1=1659552&r2=1659553&view=diff
>> ================================================================
>> ==============
>> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
>> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Feb 13 13:26:53
>> 2015
>> @@ -2124,7 +2124,7 @@ add_directory(const char *path,
>> replacement. Let's install a better tree conflict. */
>>
>> SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL,
>> - &move_src_op_root_abspath,
>> + &move_src_op_root_abspath,
>> eb->db,
>> db->local_abspath,
>> tree_conflict,
> FYI: This indentation bug was on purpose to keep things within 80 characters.
We have other way of keeping things withing 80 columns; in this case you
should fold the arguments onto the next line:
SVN_ERR(svn_wc__conflict_read_tree_conflict(
&reason, NULL, &move_src_op_root_abspath,
eb->db, db->local_abspath, tree_conflict,
...));
-- Brane