You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/22 21:33:20 UTC
svn commit: r1485365 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_subr/subst.c
Author: svn-role
Date: Wed May 22 19:33:20 2013
New Revision: 1485365
URL: http://svn.apache.org/r1485365
Log:
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)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/subst.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1452780
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1485365&r1=1485364&r2=1485365&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 22 19:33:20 2013
@@ -176,24 +176,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1445753
- Fix issue #3741, 'externals not removed when working copy is made shallow'.
- Justification:
- Externals linger after update --set-depth empty, causing unnecessary
- tree conflicts when the working copy is updated back to depth infinity.
- See regression test and also the recipe script attached to issue #3741.
- Votes:
- +1: stsp, rhuijben, breser
-
- * 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)
-
* r1465975
Replace assertions that trigger in the wild with proper error messages.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_subr/subst.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/subst.c?rev=1485365&r1=1485364&r2=1485365&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/subst.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/subst.c Wed May 22 19:33:20 2013
@@ -1743,7 +1743,12 @@ svn_subst_copy_and_translate4(const char
}
/* Now that dst_tmp contains the translated data, do the atomic rename. */
- return svn_error_trace(svn_io_file_rename(dst_tmp, dst, pool));
+ SVN_ERR(svn_io_file_rename(dst_tmp, dst, pool));
+
+ /* Preserve the source file's permission bits. */
+ SVN_ERR(svn_io_copy_perms(src, dst, pool));
+
+ return SVN_NO_ERROR;
}