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 2010/05/19 17:08:01 UTC
svn propchange: r946186 - svn:log
Author: rhuijben
Revision: 946186
Modified property: svn:log
Modified: svn:log at Wed May 19 15:08:01 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed May 19 15:08:01 2010
@@ -15,7 +15,7 @@ We still alert the user by reporting suc
The subtree mergeinfo created by the merge should also raise
eyebrows if it is unexpected.
-Obstructed or missing (from disk) files where already being skipped, rather
+Obstructed or missing (from disk) files were already being skipped, rather
than causing a tree conflict. Skipping obstructed or missing (from disk)
directories (rather than flagging a tree conflict) makes the behaviour
regarding obstructed and missing nodes in the working copy consistent.