Re: Merging the tree-conflicts branch to trunk

Julian Foad <julianfoad_at_btopenworld.com> writes:
> I am merging the tree-conflicts branch to trunk today. This is by no
> means "finished". Some tree-conflict behaviour is not yet done or not
> yet as we want it. The merge is to facilitate further work in this area.

+1 The sooner merged, the better.

> What's good?
>
> - Many tree conflict situations will be detected and reported, and
> will block any attempt to commit until marked as resolved.
>
> - Most existing test pass. (Some were modified to expect the new
> behaviour).
>
>
> What's not so good?
>
> - Several existing tests are marked XFail, mostly because they don't
> expect the new behaviour and the new behaviour is not yet as we want it
> [1]

But these are not regressions from currently-working trunk behavior,
right?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-15 18:27:51 CEST