Daniel Rall wrote:
> On Tue, 26 Sep 2006, Daniel Rall wrote:
>
>
>> On Tue, 26 Sep 2006, Lieven Govaerts wrote:
>> ...
>>
>>> We need some more status regression tests, do you mind writing one
>>> for this scenario? I'll probably add some more later.
>>>
>> I modified the test for issue #2533 (status test #24) to also use
>> '-vN', which is a good regression test variation in the first place.
>>
> ...
>
> I committed the test case as XFail, so it'll be there available when
> you start testing tomorrow, Paul.
>
I've made a new version of the patch as committed in r21638 which
doesn't store the root folder in the status array, but solves it locally
in the close_directory call.
It seems like this patch keeps the fix for issue 2533, without the bad
side-effects of the previous one.
Note: this patch is based on r21637, so to test it you first have to
revert r21638 (at least the changes in status.c).
regards,
Lieven.
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 21637)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -1589,6 +1589,11 @@
db->path, TRUE,
repos_text_status,
repos_prop_status, NULL));
+ else
+ {
+ eb->anchor_status->repos_prop_status = repos_prop_status;
+ eb->anchor_status->repos_text_status = repos_text_status;
+ }
}
/* Handle this directory's statuses, and then note in the parent
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 27 21:44:28 2006