I (Julian Foad) wrote: > Author: julianfoad > Date: Tue Jun 15 13:09:26 2010 > New Revision: 954863 > > URL: http://svn.apache.org/viewvc?rev=954863&view=rev > Log: > * subversion/libsvn_wc/update_editor.c > (merge_file): Remove a to-do comment, done in r942637. > > Added: > subversion/trunk/notes/wc-ng/props-move.doc > subversion/trunk/notes/wc-ng/working-node
Those added files were unintentional, and I removed them shortly afterwards in r954866. Updated the log message to note this. (My 'props-move.doc' was old and not interesting; my 'working-node' file contained some partial notes and thoughts that I made a while ago in trying to understand the DB.) > Modified: > subversion/trunk/notes/wc-ng/conflict-storage I updated the log message to mention that change as well. > subversion/trunk/subversion/libsvn_wc/update_editor.c - Julian