Create backport branch for r1577812

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577812@1577814 13f79535-47bb-0310-9956-ffa450edef68
Merge r1577812,r1577813, resolving a trivial text conflict caused by r1573006

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577812@1577815 13f79535-47bb-0310-9956-ffa450edef68
On 1.8.x-r1577812 branch, merge r1579429 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577812@1579431 13f79535-47bb-0310-9956-ffa450edef68
Created a backport branch to fix the bug reported in
http://mail-archives.apache.org/mod_mbox/subversion-users/201404.mbox/%3CCAAVTFFjrZEy-PT3i1xu0mOM_AC89-237CmFEZ7QYcJxNckfEtA%40mail.gmail.com%3E

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-javahl-exception-crash@1586424 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-javahl-exception-crash branch:
Manually backport the fix from trunk JavaHL.

[in subversion/bindings/javahl]

* native/JNIUtil.h (JNIUtil::wrappedHandleSVNError):
   Declare new private method.
* native/JNIUtil.cpp
  (JNIUtil::wrappedHandleSVNError): Renamed from JNIUtil::handleSVNError.
   Removed the bit that (only sometimes) clears the SVN error.
  (JNIUtil::handleSVNError): New wrapper for above that always clears the error.
  (JNIUtil::thrownExceptionToCString): Use the concrete exception class
   to retreive the message, and never return a NULL message if an exception
   was thrown.


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

 * r1571747, r1571787, r1571795
   Resolve the 'commit_util.c' (repos_root_url && repos_relpath) assertion.
   Notes:
     This assertion is raised when specifically committing a deleted
     descendant, like via a checkbox list in a GUI client.
   Justification:
     Often reported assertion by users. Upto now very hard to reproduce
     for these users. Probably because they didn't see that the node they
     deleted wasn't added to the repository yet.
   Votes:
     +1: rhuijben, philip, steveking


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

 * r1577812, r1577813, r1579429
   Resolve a segfault when 'svn merge --force' merges a directory delete
   Justification:
     Even though this merge flag is not recommended, it shouldn't cause a
     segfault.
   Notes:
     r1577812 contains the actual fix and a regression test. r1577813 is
     a minor improvement. A branch is necessary because a comment right above
     the fix contained a typo that was fixed on trunk in a huge commit of many
     typo fixes.
   Branch:
     ^/subversion/branches/1.8.x-r1577812
   Votes:
     +1: philip, rhuijben, julianfoad


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

 * r1577294
   Make interactive conflict resolver behave as designed.
   Justification:
     This was intended to be the behavior form the start.  A typo in a
     refactoring broke it.  This fix helps users avoid accidentally choosing
     'mark resolved' and committing conflict markers.
   Votes:
     +1: breser, ivan, julianfoad


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

 * r1580832
   Resolve 'svnrdump load' segfault deleting an 'svn:*' property (issue #4490)
   Justification:
     Simple fix for a segfault
   Notes:
     r1586668 on trunk is a regression test for this fix. Normally we'd
     backport a regression test along with a fix but others have already
     voted for the fix without it, so, as it's simple, I'm not bothering to
     do so this time.
   Votes:
     +1: rhuijben, ivan, julianfoad


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1588148 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1570642 group from trunk, with --accept=working:

 * r1570642, r1585686, r1586352
   Fix memcached support.
   Justification:
     Enabling memcached causes crashes without these fixes.
     Regression from 1.7.
   Notes:
     Merge with --accept=working to resolve FSX conflict.
   Votes:
     +1: stsp, philip, julianfoad


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

 * r1578670, r1578820, r1579274, r1587511
   Fix the order of node record headers written by svndumpfilter.
   Justification:
     Makes output match the rules documented in notes/dump-load-format.txt.
   Votes:
     +1: philip, julianfoad, rhuijben


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

 * r1587946
   Fix variable usage after it is out of scope.
   Justification:
     While not reported by users, this might cause hard to diagnose segfaults.
   Votes:
     +1: rhuijben, philip, steveking


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1588151 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-javahl-exception-crash branch:

 * r1586439
   Fix a crash in JavaHL that was reported on the users@ list and is
   already fixed on trunk.
   Justification:
     JavaHL should not crash the JVM too often.
   Notes:
     The original report is here:
     http://mail-archives.apache.org/mod_mbox/subversion-users/201404.mbox/%3CCAAVTFFjrZEy-PT3i1xu0mOM_AC89-237CmFEZ7QYcJxNckfEtA%40mail.gmail.com%3E
   Branch:
     ^/subversion/branches/1.8.x-javahl-exception-crash
   Votes:
     +1: brane, rhuijben


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

 * r1586052, r1586467
   Fix two memory lifetime bugs in the Ruby bindings.
   Justification:
     Ruby bindings tests crash with APR pool debugging enabled.
   Votes:
     +1: stsp
     +0: rhuijben (Looks good. Can't test)
sentinel


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