svn-windows-local buildbot


Found
r1747728, r1727733, r1727408

r1747728 | stsp | 2016-06-10 10:07:39 -0500 (Fri, 10 Jun 2016)

* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_file_text_merge): Initialize local_abspath earlier,
   before we use it in an error path.

Found by: svn-windows-local buildbot


r1727733 | stsp | 2016-01-30 11:11:30 -0600 (Sat, 30 Jan 2016)

* subversion/libsvn_client/resolved.c
  (svn_client_conflict_prop_get_resolution_options): Ensure that options
   returned from here live in writable memory so that option->type_data 
   can be written to. Should fix access violation on Windows.

Found by: svn-windows-local buildbot


r1727408 | stsp | 2016-01-28 11:12:21 -0600 (Thu, 28 Jan 2016)

* subversion/svn/conflict-callbacks.c
  (svn_cl__resolve_conflict): Fix type of props_conflicted pointer variable.

Found by: svn-windows-local buildbot