Author: rhuijben
Revision: 1448162
Modified property: svn:log
Modified: svn:log at Wed Feb 20 13:41:48 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Feb 20 13:41:48 2013
@@ -1,6 +1,6 @@
-When updating shadowed nodes, conflicts that are not on the op-root of the
-shadowing don't have to cause a skip for BASE only changes, as the conflict
-only describes the nodes WORKING state.
+When a node is conflicted, it is conflicted in WORKING. When BASE is completely
+shadowed (and this is not the op-root of the shadowing) the conflict is
+unrelated to the BASE update and the update can just continue.
This makes it easier to rely on the update code for recovering of certain
kinds of tree conflicts.
