Merge r1476366 from trunk:

 * r1476366
   Eliminate an unsafe printf format string.
   Justification:
     Avoid a compiler warning and avoid fear, uncertainty and doubt when
     people see this code. There is no an actual risk AFAICT; see my email
     <http://svn.haxx.se/dev/archive-2013-04/0601.shtml>.
   Votes:
     +1: julianfoad, danielsh, rhuijben


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1477464 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1470904 group from trunk:

 * r1470904, r1471744, r1475963, r1476155, r1476181, r1476254
   Tweak an upgrade Sql statement to be easier to understand and a tiny bit
   faster
   Justification:
     The old variant had some theoretical upgrade problems.
   Notes:
     r1470904, r1471744, r1475963 are a series of tweaks to the
     STMT_UPGRADE_31_SELECT_WCROOT_NODES query.  r1476155 is a new
     upgrade test.  r1476181, r1476254 are for 1.6 upgrades.
   Votes:
     +1: philip, pburba, rhuijben


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1477465 13f79535-47bb-0310-9956-ffa450edef68
Merge r1470031 from trunk:

 * r1470031
   Correctly set the 'action' and 'reason' fields of a property conflict.
   API users were seeing the wrong 'action' and 'reason' for some property
   conflicts. 'svn' does not yet use these fields.
   Justification:
     It's wrong.  It's simple.  Fixing it in a 1.x.0 release involves less
     risk of interfering with any client's work-around for the bug.  We may
     want to backport changes to 'svn' to report property conflicts better,
     and then 'svn' may use these fields; I'm working on such a change.
   Votes:
     +1: julianfoad, philip
     +1: rhuijben   (after this patch the situation is better, but I'm not
                     sure if it is optimal. In merge there are 4 trees to
                     consider before we can tell the reason. The 4th tree
                     is available as the pristine version of the local node)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1477466 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1469862 group from trunk:

 * r1469862, r1469866, r1475704
   Change configure default to --without-apache-libexecdir.
   Justification:
     Before this change, by default, Apache modules would very likely be
     installed outside of $prefix, while still being linked with shared
     libraries in $prefix. This is not expected behaviour.
   Votes:
     +1: brane, philip, cmpilato
     +0: danielsh (refraining from defaulting to ${httpd_libexecdir} is sane:
                   e.g., allow install >1 svn's against a single httpd install)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1477467 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1470238 group from trunk:

 * r1470238, r1471153
   Improve labelling of the file diff in interactive conflict resolution 'df'
   option. Show labels such as "THEIRS" and "MERGED", not just the paths to
   the files on disk.
   Justification:
     It was confusing because the same 'df' option can show a different pair
     of files depending on whether the conflicted operation was an update or
     a merge, and on whether there's a base file or not.
   Votes:
     +1: julianfoad, philip, cmpilato


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1477468 13f79535-47bb-0310-9956-ffa450edef68