[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1619418 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c svn/cl-conflicts.c tests/cmdline/switch_tests.py tests/cmdline/tree_conflict_tests.py tests/libsvn_wc/conflict-data-test.c

From: Branko Čibej <brane_at_wandisco.com>
Date: Fri, 22 Aug 2014 10:07:12 +0100

On 21.08.2014 15:51, stsp_at_apache.org 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. brane_at_wandisco.com
Received on 2014-08-22 11:07:41 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.