Author: cmpilato
Date: Mon Sep 10 12:52:32 2012
New Revision: 1382806
URL: http://svn.apache.org/viewvc?rev=1382806&view=rev
Log:
On the '1.6.x' branch:
* STATUS
(r1338810 group): Add r1339154, resolving danielsh's suggestion to
do so, and boldly assuming that philip would +1 the obvious
additional fix. This approves the change.
(r1330410 group, r1088602 group): Vote affirmatively, approving.
Modified:
subversion/branches/1.6.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1382806&r1=1382805&r2=1382806&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Sep 10 12:52:32 2012
@@ -45,19 +45,24 @@ Candidate changes:
+0: gstein (haven't reviewed these specific revisions yet)
-0: stsp (not a critical fix, serf is an optional dependency in 1.6.x)
- * r1330410, r1330554
- Fix an error leak in the hook script invocation code.
+Veto-blocked changes:
+=====================
+
+ * r1138975, r1138977
+ Add a sanity check to get-deps.sh.
Justification:
- This bug can cause a server process to hang.
+ Prevent a false impression as to which version of a dependency will be
+ used.
Notes:
- - r1330410 was merged from trunk and fixes the bug.
- - r1330554 is a 1.6.x-specific follow-up fix that prevents the bug fix
- from changing control flow such that a file handle is closed which
- was never opened.
- Branch:
- ^/subversion/branches/1.6.x-r1330410
+ r1138975 is the change. r1138977 reverts accidentally-committed local
+ changes. Note that r1138977 replaces the bogusly-committed files rather
+ than merges into them.
Votes:
- +1: stsp, philip
+ +1: danielsh
+ -1: stsp (not a security or data-corruption fix)
+
+Approved changes:
+=================
* r1088602
Fix regression introduced in r1104127. That revision introduced a bug where
@@ -74,9 +79,23 @@ Candidate changes:
The revision also edited the dav-mirror-autocheck.sh script which
does not exist in 1.6.
Votes:
- +1: stsp, philip
+ +1: stsp, philip, cmpilato
- * r1338810, r1339164
+ * r1330410, r1330554
+ Fix an error leak in the hook script invocation code.
+ Justification:
+ This bug can cause a server process to hang.
+ Notes:
+ - r1330410 was merged from trunk and fixes the bug.
+ - r1330554 is a 1.6.x-specific follow-up fix that prevents the bug fix
+ from changing control flow such that a file handle is closed which
+ was never opened.
+ Branch:
+ ^/subversion/branches/1.6.x-r1330410
+ Votes:
+ +1: stsp, philip, cmpilato
+
+ * r1338810, r1339164, r1339154
Fix issue #4184 ("partial svnsync drops properties when converting
copies to adds").
Justification:
@@ -84,26 +103,7 @@ Candidate changes:
Notes:
r1338810 taught the code to send properties for demoted copies.
r1339164 fixed a theoretical use of uninitialized memory.
+ r1339154 is an obvious fix of an accidental docstring tweak.
Votes:
- +1: philip, stsp
- +0: danielsh (maybe add r1339154 to this group too?)
-
-Veto-blocked changes:
-=====================
-
- * r1138975, r1138977
- Add a sanity check to get-deps.sh.
- Justification:
- Prevent a false impression as to which version of a dependency will be
- used.
- Notes:
- r1138975 is the change. r1138977 reverts accidentally-committed local
- changes. Note that r1138977 replaces the bogusly-committed files rather
- than merges into them.
- Votes:
- +1: danielsh
- -1: stsp (not a security or data-corruption fix)
-
-Approved changes:
-=================
-
+ +1: philip, stsp, cmpilato
+ +0: danielsh
