r1718357, r1713672, r1676253, r1632635, r1632623

r1632623 | stefan2 | 2014-10-17 16:21:13 +0000 (Fri, 17 Oct 2014)

Reformulate the uint64 value remapping code in packed_data.c such that
it no longer relies on undefined uint->int conversion behavior.

* subversion/libsvn_subr/packed_data.c
   unmap_uint): New utilities factored out from the other functions.
                Reimplement the value mapping without using intermediate
                signed values.
   svn_packed__data_fill_buffer): Use the new utilities to pre / post
                                  process the buffered values.

Found by: philipm

r1632635 | stefan2 | 2014-10-17 16:54:27 +0000 (Fri, 17 Oct 2014)

Fix an instance where we call memcpy of 0 bytes with a NULL target.

* subversion/include/svn_delta.h
  (svn_txdelta_apply_instructions): Update docstring.

* subversion/libsvn_delta/text_delta.c
  (svn_txdelta_apply_instructions): Don't touch any of the buffers
                                    if the target has zero size.

Found by: philipm

r1676253 | julianfoad | 2015-04-27 13:15:34 +0000 (Mon, 27 Apr 2015)

On the 'move-tracking-2' branch: Fix merging from a subbranch to the
parent branch.

Found by: philipm

* subversion/svnmover/svnmover.c
  (content_merge): New, factored out..
  (element_merge): ... from here.
  (branch_merge_subtree_r): For the subtree root element, do not
    merge its parent and name but only its content.

* subversion/tests/cmdline/
  (merge_from_subbranch_to_subtree): New test.
  (test_list): Run it.

r1713672 | julianfoad | 2015-11-10 15:48:03 +0000 (Tue, 10 Nov 2015)

On the 'move-tracking-2' branch: Fix memory allocation bug.

Found by: philipm

* subversion/libsvn_delta/branch.c
   svn_branch_rev_bid_create): Deep-copy the arguments.

r1718357 | rhuijben | 2015-12-07 13:56:17 +0000 (Mon, 07 Dec 2015)

On the ra-git branch: Remove yet another call that doesn't go via the vtable.

Found by: philipm

* subversion/libsvn_ra_git/session.c
  (ra_git_get_file_revs): Update caller.