Andrew Reedick


r1523666 | stsp | 2013-09-16 09:21:03 -0500 (Mon, 16 Sep 2013)

Resolve a regression in the reintegrate path calculations introduced by
optimizations made in r1311669.

* subversion/libsvn_client/merge.c
  (log_find_operative_revs): Don't corrupt mergeinfo paths by snipping off
   trailing characters. This function is trying to compute a common prefix
   of paths by snipping off a suffix detected with relpath_skip_ancestor().
   If relpath_skip_ancestor() returns "" it wants to tell its caller that
   the paths provided were equal. This function erroneously went on to
   perform path arithmetic anyway, with a zero-sized suffix string, and
   thus computed corrupt mergeinfo.

Reported by: Andrew Reedick
Review by: rhuijben