Neels J Hofmeyr wrote:
> Julian Foad wrote:
> > Neels J Hofmeyr wrote:
> >> Hi tree-conflicts folks,
> >>
> >> I'm intrigued by the tree-conflicts code in update_editor.c that checks for
> >> TCs involving add. Using 'update' and 'switch', I can't find any way to
> >> produce a tree-conflict.
> >>
> >> No-one asked for tests about it, so we don't have any.
>
> Sorry, I only looked in update_tests.py and switch_tests.py; thanks for this
> hint:
>
> >
> > Tests exist:
> >
> > tree_conflict_tests.py 4 8 12 16
>
> But I see now that although these are successful, we still don't have tests
> for the simple cases.
>
> Add-vs.-add during update/switch only become tree-conflicts when the local
> add is an add-with-history. My tests with *simple* adds produce no
> tree-conflicts, nor where the *incoming* add is with-history.
Oh dear... lack of test coverage and lack of implementation coverage.
> Did we at some point decide to not flag simple local adds as tree-conflicts?
Not that I recall.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2415819
Received on 2009-11-09 16:53:54 CET