Re: svn commit: r37160 - trunk/subversion/svn

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
Received on 2009-04-11 15:01:03 CEST