You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2011/09/16 13:00:37 UTC
RE: svn commit: r1171353 - /subversion/trunk/subversion/libsvn_wc/status.c
> -----Original Message-----
> From: neels@apache.org [mailto:neels@apache.org]
> Sent: vrijdag 16 september 2011 3:40
> To: commits@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
Re: svn commit: r1171353 - /subversion/trunk/subversion/libsvn_wc/status.c
Posted by Neels J Hofmeyr <ne...@elego.de>.
Gotcha -- I was removing conditions and hit on one too much. Thanks for
tracing the fail back to ra_local-only me. Fixed in r1172400.
~Neels
On 09/16/2011 01:00 PM, Bert Huijben wrote:
> 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
>