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

Re: Tree-conflicts: HEADS UP: update failure with tc-siblings :0

From: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 19 Nov 2008 22:36:07 +0100

Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:

> Stephen Butler wrote:
>> Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
> ...
>>> 4. Steve reverts (2) and says he's onto fixing it by adding an
>>> <wc-entry-add-tree-conflict/> instruction to the log (suggested by
>>> neels).

> ...
>> OK, I'll work on (4) this afternoon, make one or two commits or a patch,
>> and you can take over this evening.
> From the current time I take it you're not still working on it. From a lack
> of commits by you or any other mail on this I take it you didn't do any of
> that :)
> I was still held up with "commit", so I'll see again tomorrow whether you've
> committed/posted something.

Hi Neels,

sorry for the delay. In r34273 I committed some prep work for the new
loggy action. I suppose I should finish it myself. Unless we decide
to revise our design and make every tree conflict victim have an entry
(issue 3327).

In any case, would you like to have a go at enhancing the tree conflict
data (issue 3322)?


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-19 22:36:18 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.