Author: hwright
Revision: 1158680
Modified property: svn:log
Modified: svn:log at Wed Aug 17 13:49:04 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Aug 17 13:49:04 2011
@@ -1,13 +1,10 @@
Merge r1158421, r1158436, r1158455 from trunk, resolving conflicts as noted:
-
- * r1154165
- Make the cmdline argument parser ignore upgrade required errors to
- allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
- error.
+
+ * r1158421, r1158436, r1158455
+ JavaHL: Fix implementation of propertySetRemote method.
Justification:
- Usually svn allows case differences, but in this case it doesn't.
- (Triggerable in other scenarios)
- http://svn.haxx.se/users/archive-2011-08/0142.shtml
+ The new method is not usable without these changes.
+ NOTE: This has trivial merge conflicts that need to be resolved due
+ to the JavaHL pool usage changes in trunk.
Votes:
- +1: rhuijben, arfrever, stsp
-
+ +1: markphip, rhuijben
