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

RE: svn commit: r939150 - /subversion/trunk/subversion/libsvn_client/merge.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 29 Apr 2010 12:55:49 +0200

> -----Original Message-----
> From: neels_at_apache.org [mailto:neels_at_apache.org]
> Sent: donderdag 29 april 2010 2:49
> To: commits_at_subversion.apache.org
> Subject: svn commit: r939150 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> Author: neels
> Date: Thu Apr 29 00:49:16 2010
> New Revision: 939150
>
> URL: http://svn.apache.org/viewvc?rev=939150&view=rev
> Log:
> Another entry_t down.
>
> * subversion/libsvn_client/merge.c
> (obstructed_or_missing):
> Use wc-ng API instead of svn_wc__get_entry_versioned(), and much
> simplify
> this function in the process. Untangle, rinse and dry.
> (node_kind_working, node_kind_on_disk):
> Remove these ghastly two functions and incorporate into
> obstructed_or_missing(), the way it should always have been.

This patch breaks
FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
(which is automatically skipped on ra_local)

Most likely your new check doesn't work correctly for 'absent' nodes.
I would recommend also checking the behavior for excluded node, as our test suite doesn't test those as often as it should.
(Nice effect is that you can check excluded on ra_local, but can't check absent)

        Bert
Received on 2010-04-29 12:56:29 CEST

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