> -----Original Message-----
> From: [email protected] [mailto:[email protected]]
> Sent: vrijdag 16 september 2011 3:40
> To: [email protected]
> 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

Reply via email to