On 21.08.2014 15:51, [email protected] wrote: > Author: stsp > Date: Thu Aug 21 14:51:35 2014 > New Revision: 1619418 > > URL: http://svn.apache.org/r1619418 > Log: > Fix misreporting of tree conflict victim's node kind, in particular > in cases where the victim is an obstruction. > > * subversion/libsvn_wc/conflicts.c > (read_tree_conflict_desc): The local node kind cannot be derived from the > incoming src-left or src-right node kind as was done here. For example, > local unversioned files were labeled as 'local dir' if they obstructed > an incoming directory addition. If the conflict reason is an obstruction > we must check the on-disk state of the node and use it to describe the > victim's node kind. Missing nodes obviously have node type 'none' but > they were described as 'file'.
It would be really nice if this explanation was in the code instead of in the log message. -- Brane -- Branko Čibej | Director of Subversion WANdisco | Realising the impossibilities of Big Data e. [email protected]
