Merge the r1421541 group from trunk:

 * r1421541, r1424977
   Fix infinite recursion in './get-deps.sh'.
   Justification:
     Trivial fix to plug an edge case.
   Votes:
     -0: rhuijben (Is this needed on this branch?)
     +1: breser, stsp, danielsh (as much as it's needed on trunk)


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

 * r1434128, r1434435, r1434476
   Fix issue #4034, 'blame on files with non-native eol-style sees every
   line as modified'.
   Justification:
     When blaming to the working copy instead of the base version eol styles
     all other styles than those with "\n" repository form show up as
     entirely changed.
   Votes:
     +1: rhuijben, stsp, breser


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

 * r1434750
   Resolve regression in 'svn status -u' output when running on externals.
   Without this patch the paths in directory externals are shown as absolute
   while all others are shown relative/as provided by the user.
   Justification:
     Consistent api behavior is good
   Votes:
     +1: rhuijben, stsp, breser


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

 * r1452780
   Address issue #4331, "working copy permissions change on commit for files
   with keywords".
   Justification:
     Keyword translation should not affect file permission bits.
   Votes:
     +1: stsp, breser, danielsh
     +0: rhuijben (code looks ok, but is a no-op on Windows)


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

 * r1465975
   Replace assertions that trigger in the wild with proper error messages.
   Justification:
     User-friendliness, see http://svn.haxx.se/users/archive-2013-04/0064.shtml
     Showing the problematic path will help with figuring out the problem.
   Votes:
     +1: stsp, breser
     +1: danielsh (should we avoid svn_dirent_local_style in this case, i.e.,
                   print the literal value that nodes.local_relpath is expected
                   to contain?)


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