Move more variables to a smaller scope and fix uninitialized output parameters in callback functions. The variables previously had initializers which were only necessary because the callbacks didn't always initialize all their outputs as they should. This change might be expected to cause a behaviour change, since the initialization was previously happening only once before the first iteration of the loop. I have checked fairly thoroughly and it seems in the cases where outputs weren't initialized they weren't tested or the loop terminated or there was some other compensating effect.
Move more variables to a smaller scope and fix uninitialized output
parameters in callback functions. The variables previously had
initializers which were only necessary because the callbacks didn't
always initialize all their outputs as they should. This change might be
expected to cause a behaviour change, since the initialization was
previously happening only once before the first iteration of the loop.
I have checked fairly thoroughly and it seems in the cases where
outputs weren't initialized they weren't tested or the loop terminated
or there was some other compensating effect.

* subversion/libsvn_client/merge.c:
  (merged_file_changed, merged_file_added, merged_file_deleted):
    Initialize the 'tree_conflicted' output at the beginning, as not all code
    paths set it before returning.
  (do_file_merge): Move variables to a smaller scope; remove initializers.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion