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

RE: svn commit: r1171353 - /subversion/trunk/subversion/libsvn_wc/status.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Fri, 16 Sep 2011 13:00:37 +0200

> -----Original Message-----
> From: neels_at_apache.org [mailto:neels_at_apache.org]
> Sent: vrijdag 16 september 2011 3:40
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1171353 -
> /subversion/trunk/subversion/libsvn_wc/status.c
>
> Author: neels
> Date: Fri Sep 16 01:40:24 2011
> New Revision: 1171353
>
> URL: http://svn.apache.org/viewvc?rev=1171353&view=rev
> Log:
> Follow up to r1171196: refine around unversioned tree conflicted nodes.
>
> * subversion/libsvn_wc/status.c
> (one_child_status):
> Rename TREE_CONFLICTED to UNVERSIONED_TREE_CONFLICTED, and
> properly ignore
> it when INFO != NULL. Shorten logic, adding the kind != unknown condition
> so that get_child_status() can just pass in any INFO struct it has.
> Remove a code dup calling send_status_structure(). Comment.
> (get_child_status):
> Remove obsoleted condition and pass UNVERSIONED_TREE_CONFLICTED
> accordingly.

This breaks
FAIL: authz_tests.py 18: wc-to-wc-copy with absent nodes and then revert

On all ra-layers except ra-local,

I think the interesting part of the error is:
--- EXPECTED STDOUT
+++ ACTUAL STDOUT
@@ -1,3 +1,4 @@
 A + - 1 jrandom svn-test-work/working_copies/authz_tests-18/A2
+ + - 1 jrandom svn-test-work/working_copies/authz_tests-18/A2/mu
    + - 1 jrandom svn-test-work/working_copies/authz_tests-18/A2/B
-! - ? ? svn-test-work/working_copies/authz_tests-18/A2/B/E
+ + - 1 jrandom svn-test-work/working_copies/authz_tests-18/A2/B/lambda

        Bert
Received on 2011-09-16 13:01:15 CEST

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