You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/11/08 17:57:28 UTC

svn propchange: r1407164 - svn:log

Author: rhuijben
Revision: 1407164
Modified property: svn:log

Modified: svn:log at Thu Nov  8 16:57:28 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Nov  8 16:57:28 2012
@@ -1 +1,8 @@
-Create r1407131 backport branch
+Create r1407131 backport branch.
+
+Merge r1407131, from trunk resolving conflicts due to changed conflict
+handling and earlier attempts to fix this issue.
+
+Merge r1407035, r1407075 of subversion/tests/cmdline/svntests to obtain
+a new helper function needed to run the new test on Windows.
+(Fixing it by using the old support would break testing on Windows)