You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Lieven Govaerts <sv...@mobsol.be> on 2009/04/11 12:04:42 UTC
Re: svn commit: r37160 - trunk/subversion/svn
Stefan,
looks like this commit breaks merge_authz test 1 over http (see the mac
buildbot). The solution seems simple, your patch changed the output of
'svn status', attached patch will update the expected status output in
the test.
Is this correct?
Lieven
[[[
Follow up r37160: fix failing merge_authz test.
* subversion/tests/cmdline/merge_authz_tests.py
(mergeinfo_and_skipped_paths): adapt the expected status output, we
should also see tree conflicts.
]]]
On 04/10/2009 04:29 PM, Stefan Sperling wrote:
> Author: stsp
> Date: Fri Apr 10 07:29:04 2009
> New Revision: 37160
>
> Log:
> Fix issue #3396, "status --quiet doesn't show tree conflicts"
>
> * subversion/svn/status.c
> (svn_cl__print_status): Just because we got no entry does not mean
> that there's nothing to do. We may still have a tree conflict victim
> to show status for.
>
> Modified:
> trunk/subversion/svn/status.c
>
> Modified: trunk/subversion/svn/status.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/status.c?pathrev=37160&r1=37159&r2=37160
> ==============================================================================
> --- trunk/subversion/svn/status.c Fri Apr 10 07:02:45 2009 (r37159)
> +++ trunk/subversion/svn/status.c Fri Apr 10 07:29:04 2009 (r37160)
> @@ -361,7 +361,7 @@ svn_cl__print_status(const char *path,
> apr_pool_t *pool)
> {
> if (! status
> - || (skip_unrecognized&& ! status->entry)
> + || (skip_unrecognized&& !(status->entry || status->tree_conflict))
> || (status->text_status == svn_wc_status_none
> && status->repos_text_status == svn_wc_status_none))
> return SVN_NO_ERROR;
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1631546
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1647900
Re: svn commit: r37160 - trunk/subversion/svn
Posted by Lieven Govaerts <sv...@mobsol.be>.
On 04/11/2009 02:59 PM, Stefan Sperling wrote:
> On Sat, Apr 11, 2009 at 02:04:42PM +0200, Lieven Govaerts wrote:
>> Stefan,
>>
>> looks like this commit breaks merge_authz test 1 over http (see the mac
>> buildbot). The solution seems simple, your patch changed the output of
>> 'svn status', attached patch will update the expected status output in
>> the test.
>>
>> Is this correct?
>
> Yes. This is just like the other tests that needed fixing.
> The bug could have been caught much earlier if we had realised
> that the test expects a tree conflict to be raised, but does not
> expect it in status output!!! We should have asked ourselves if this
> made any sense at all but didn't :(
>
> expected_output = wc.State(A_COPY_2_path, {
> 'D/G' : Item(status=' ', treeconflict='C'),<-- tree conflict
> 'D/H/omega' : Item(status='U '),
> })
> expected_status = wc.State(A_COPY_2_path, {<-- no mention of D/G in here
> '' : Item(status=' M', wc_rev=8),
> 'D/H/chi' : Item(status=' M', wc_rev=8),
>
> Please commit and nominate for backport to 1.6.x.
>
r37175
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1650127
Re: svn commit: r37160 - trunk/subversion/svn
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Apr 11, 2009 at 02:04:42PM +0200, Lieven Govaerts wrote:
> Stefan,
>
> looks like this commit breaks merge_authz test 1 over http (see the mac
> buildbot). The solution seems simple, your patch changed the output of
> 'svn status', attached patch will update the expected status output in
> the test.
>
> Is this correct?
Yes. This is just like the other tests that needed fixing.
The bug could have been caught much earlier if we had realised
that the test expects a tree conflict to be raised, but does not
expect it in status output!!! We should have asked ourselves if this
made any sense at all but didn't :(
expected_output = wc.State(A_COPY_2_path, {
'D/G' : Item(status=' ', treeconflict='C'), <-- tree conflict
'D/H/omega' : Item(status='U '),
})
expected_status = wc.State(A_COPY_2_path, { <-- no mention of D/G in here
'' : Item(status=' M', wc_rev=8),
'D/H/chi' : Item(status=' M', wc_rev=8),
Please commit and nominate for backport to 1.6.x.
Thanks,
Stefan