You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2007/03/21 09:09:07 UTC
[PATCH][merge-tracking] Fix build failure as a result of r23946
Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
Re: [PATCH][merge-tracking] Fix build failure as a result of r23946
Posted by Kamesh Jayachandran <ka...@collab.net>.
>> +++ subversion/libsvn_client/diff.c (working copy)
>> @@ -1820,7 +1820,7 @@
>> && (wcpath[2] == '/')
>> && ((wcpath[0] >= 'A' && wcpath[0] <= 'Z')
>> || (wcpath[0] >= 'a' && wcpath[0] <= 'z'))))
>> -#elif
>> +#else
>> if (!(strlen(wcpath) > 0 && wcpath[0] == '/'))
>> #endif /* WIN32 or Cygwin */
>> {
>
> Hi Kamesh,
>
> +1 to commit, ofcourse. (I'd say this is one which fits the 'obvious
> fix' rule, even.)
>
> bye,
>
> Erik.
>
Thanks Erik. fixed in r23952.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH][merge-tracking] Fix build failure as a result of r23946
Posted by Erik Huelsmann <eh...@gmail.com>.
On 3/21/07, Kamesh Jayachandran <ka...@collab.net> wrote:
> Hi All,
> Find the attached patch and log.
>
> With regards
> Kamesh Jayachandran
>
> [[[
> On the merge-tracking branch: Fix build failure as a result of r23946.
>
> * subversion/libsvn_client/diff.c
> (get_wc_merge_info):
> '#elif' -> '#else'
>
> Patch by:kameshj
> ]]]
>
> Index: subversion/libsvn_client/diff.c
> ===================================================================
> --- subversion/libsvn_client/diff.c (revision 23951)
> +++ subversion/libsvn_client/diff.c (working copy)
> @@ -1820,7 +1820,7 @@
> && (wcpath[2] == '/')
> && ((wcpath[0] >= 'A' && wcpath[0] <= 'Z')
> || (wcpath[0] >= 'a' && wcpath[0] <= 'z'))))
> -#elif
> +#else
> if (!(strlen(wcpath) > 0 && wcpath[0] == '/'))
> #endif /* WIN32 or Cygwin */
> {
Hi Kamesh,
+1 to commit, ofcourse. (I'd say this is one which fits the 'obvious
fix' rule, even.)
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org