On Mon, Jan 09, 2023 at 11:19:48AM +0100, Johannes von Rotz wrote:
> Hello
> 
> I was trying to compile subversion with the HP ANSI C compiler on HP-UX
> yesterday, which complained about the if-statement in question requiring a
> scalar value or something. Unfortunately, I'm unable to recite the specific
> error message, since I'm currently at work (Ahem...)
> 
> It seems to me that there is a missing pointer dereference in that
> if-statement, but i might be wrong about that. Feel free to ignore this...
> 
> Cheers, J.

Thank you Johannes, this has been committed. Your fix is indeed correct.

> Index: subversion/libsvn_diff/parse-diff.c
> ===================================================================
> --- subversion/libsvn_diff/parse-diff.c       (revision 1906480)
> +++ subversion/libsvn_diff/parse-diff.c       (working copy)
> @@ -1006,7 +1006,7 @@ parse_pretty_mergeinfo_line(svn_boolean_t *found_m
>                  }
>                (*number_of_reverse_merges)--;
>              }
> -          else if (number_of_forward_merges > 0) /* forward merges */
> +          else if (*number_of_forward_merges > 0) /* forward merges */
>              {
>                if (patch->reverse)
>                  {

Reply via email to