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

Re: T/C and 1.6 (was Re: Lose users?)

From: Stephen Butler <sbutler_at_elego.de>
Date: Tue, 18 Nov 2008 02:20:52 +0100

Quoting "Hyrum K. Wright" <hyrum_wright_at_mail.utexas.edu>:

> After talking with Karl in IRC just now, my view is kind of changing:
> Let's yank the APIs now, branch 1.6.x at the end of the week, stabilize, and
> release 1.6 with the currently implemented features.

> I think the trepidation to yank the tree conflicts APIs for 1.6
> comes from the
> innate emotional attachment developers tend to have to their own code and a
> desire to see it ship.

Guilty as charged, your honor. ;-) I also tend to focus too closely
on short term goals and the next patches, and lose perspective on the
medium-term issues that really block this feature from release.

The code for tree conflict detection, skipping, and status-reporting
has matured a lot in the last few weeks. But I'm afraid our design
for resolve and revert is still rather sketchy. We hadn't realized
how tricky it is to resolve tree conflicts. And helping the user
by offering "mine-full", "theirs-full", etc. will take APIs and
infrastructure that are difficult to shoehorn into the current
piecemeal-admin-area architecture.

Leaving users to detect tree conflicts on their own isn't an ideal
solution, either, but at least we won't be in trouble for blocking
their commits!

Tree conflict fans, do you agree?

> As a thought experiment, how difficult would it be to release 1.6
> without tree
> conflicts?

TODO: Take out TC code and tests, restore old error messages
(that we replaced with TCs), and tweak old tests that create
TCs inadvertently.

A few hours, I guess. I think we could safely plan to branch
Wednesday evening.


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-18 02:21:08 CET

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.