Re: svn commit: r30542 - in branches/tree-conflicts/subversion: include libsvn_client libsvn_wc tests/cmdline tests/cmdline/svntest

Stefan Sperling wrote:
>>Author: julianfoad
[...]
>>+ case svn_wc_conflict_reason_added:
[...]
>
> The above looks incomplete.
>
> Shouldn't we add code to read this reason from the this_dir entry as well?
> Just writing it is only half the job -- svn will throw errors upon
> reading the data if it does not expect it.

Oh, yes! I missed that.

> I guess something like the diff below wouldn't hurt.

Thanks. Committing... r30579.

> Does it look right? Am I correct assuming that the new reason
> is only relevant during merge?

Yes, it's only relevant during merge.

> I like the dedicated tree conflicts tests script.
> Do you plan on migrating the existing tree conflict tests (in the update,
> merge and possibly other test scripts) to the dedicated tree conflicts
> tests script?

I haven't planned to migrate the existing tests, but I'll have a look later and
see if they are redundant. I think it would be good to keep some tests that
specifically cover the use cases that were deemed to be important to the user
experience, in addition to my set of tests which are checking that the
implementation matches the design.

- Julian

> [[[
> On the tree-conflicts branch, handle reading of the new
> conflict reason svn_wc_conflict_reason_added.
[...]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-14 14:11:50 CEST