subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn propchange: r1336926 - svn:log
Date Thu, 10 May 2012 22:22:18 GMT
Author: rhuijben
Revision: 1336926
Modified property: svn:log

Modified: svn:log at Thu May 10 22:22:18 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu May 10 22:22:18 2012
@@ -1 +1,4 @@
-
+* subversion/libsvn_client/merge.c
+  (merge_dir_props_changed): Simplify tree conflict handling by using
+    information from perform_obstruction_check instead of the errors reported
+    by svn_wc_merge_props3.


Mime
View raw message