[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflicts - ready for use on trunk

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 28 May 2008 13:21:15 +0100


The tree-conflicts branch is at the stage of being a significant improvement
over svn 1.5.0 in the prevention of mistakes and potential data loss during
"svn update" and "svn merge".

The tree-conflicts branch was created to separate the unstable development work
from the stabilisation of 1.5, and to provide room for experimentation in its
early stages. Now the work on the branch is stabilising and has its own
regression tests.

I believe Subversion would benefit greatly from seeing this work merged back to
the trunk soon. There are unimplemented parts, unresolved user interface
questions, and design still to do, that I am posting about separately. However,
what is already on the branch does a useful job. This is looking like being a
significant feature in 1.6, and merging it to trunk will enable much better
visibility and cooperation on it.

Of course I won't merge it until we can agree that it is ready enough to do so,
or which parts to leave out, and so on, but I would appreciate it if folks
would take a look and help us to determine how to go about this.

Note that the tree-conflict handling we are talking about here is a basic level
of detection and ability to resolve conflicts, not a complete
automated-as-much-as-possible solution yet.

Can I ask if this proposal is OK in concept?

Any help that you can offer on filling in the details of the plan is most
appreciated too.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-28 14:21:35 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.