Author: cmpilato
Date: Tue Dec 15 18:34:52 2009
New Revision: 890933
URL: http://svn.apache.org/viewvc?rev=890933&view=rev
Log:
Vote for r880525 group, 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=890933&r1=890932&r2=890933&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Dec 15 18:34:52 2009
@@ -116,19 +116,6 @@
Votes:
+1: rhuijben
- * r880525, r880526
- Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
- a subdirectory of the current working directory.
- Justification:
- 'svn resolve --accept=theirs-conflict' cannot be used reliably.
- Notes:
- A backport branch is at ^/subversion/branches/1.6.x-r40452.
- 1.6.x has an additional bug which does not occur on trunk, requiring
- additional fixes exclusive to 1.6.x. See the log message of r880532
- (which shows what the bug is), and see r880533 (which fixes the bug).
- Votes:
- +1: stsp, pburba
-
* r880552
Try to enable TCP keep-alives in svnserve.
Justification:
@@ -175,6 +162,19 @@
Approved changes:
=================
+ * r880525, r880526
+ Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
+ a subdirectory of the current working directory.
+ Justification:
+ 'svn resolve --accept=theirs-conflict' cannot be used reliably.
+ Notes:
+ A backport branch is at ^/subversion/branches/1.6.x-r40452.
+ 1.6.x has an additional bug which does not occur on trunk, requiring
+ additional fixes exclusive to 1.6.x. See the log message of r880532
+ (which shows what the bug is), and see r880533 (which fixes the bug).
+ Votes:
+ +1: stsp, pburba, cmpilato
+
* r889840
When producing svn_mergeinfo_t from string representations, or vice-versa,
tolerate relative merge source paths, but convert such paths to absolute
