K 10 svn:author V 8 jmallett K 8 svn:date V 27 2010-05-28T20:10:10.178229Z K 7 svn:log V 171 o) Reset svn:mergeinfo. Somehow I got mergeinfo from head that was leading to endless tree conflicts on directories that I had nothing to do with. o) Merge from head. END