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

Re: branch tree-conflicts-notify

From: Stephen Butler <sbutler_at_elego.de>
Date: Tue, 28 Oct 2008 15:12:33 +0100

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> On Fri, 2008-10-24 at 17:28 +0200, Stephen Butler wrote:
> [...]
>> * How much tree conflict info do we need to pass around in an update
>> editor for use by the notify_func? Candidates include the
>> following datatypes:
>>
>> 1. svn_boolean_t
>>
>> 2. svn_wc_conflict_reason_t
>>
>> 3. svn_wc_conflict_description_t
>>
>> SB: I plead for the simplest possible datatype, because then I
>> make fewer mistakes. ;-)
>
> Urg. Too many email threads in progress. Sorry, I'm crossing emails with
> you. I already posted saying I want (3.), but anything will do for now.
> It was only a desire to get _something_ happening on trunk that we could
> all work with that led me to commit (3.) to trunk r33878 on Friday.
>
> I wouldn't have minded (1), but I've just now completed testing a
> catch-up merge to your branch which introduces (3), so rather than
> abandoning it I'm committing it. Sorry if it feels like I'm being pushy
> there.

No problem.

> You also posted saying let's merge the pre-r33891 state of the branch to
> trunk. Yes, if it's an improvement on trunk, please do it! I'm not sure
> if that means cherry-picking or reverting a susequent merge or what.

I think the branch is OK as it is. The obvious next step is to improve
the skipping of tree conflicted trees, which as we've discussed should
be committed separately.

Earlier I committed r33926 on the branch, which makes all tests
pass. No drastic changes were needed.

The branch is now fully up-to-date with trunk. I'm finishing the merge
to trunk now.

Regards,
Steve

-- 
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-10-28 15:12:47 CET

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