Re: Unused variable warning in merge.c

On Fri, 13 Jul 2007, Senthil Kumaran S wrote:

> Hi,
>
> When I compile the latest trunk, ie., rev25731, I get the following
> warning messages:
>
> <snip>
> ../subversion/libsvn_wc/merge.c: In function 'svn_wc__merge_internal':
> ../subversion/libsvn_wc/merge.c:408: warning: unused variable 'conflict_err'
> ../subversion/libsvn_wc/merge.c:653: warning: unused variable 'conflict_err'
> </snip>
>
> Is these variables really required? sussman can you confirm and make the
> necessary changes?

Senthil, thanks for the report -- these variables aren't necessary. I
assume they crept in while Ben was considering using error codes to
communicate the conflict resolution result, which he since replaced
with an enum.

I've removed these unused local variables in r25738.

Thanks, Dan