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

Re: current tree-conflicts branch status

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 29 Jan 2008 02:27:41 +0100

On Mon, Jan 28, 2008 at 09:18:59PM +0000, Julian Foad wrote:
>> I will try to describe what user-visible changes the tree-conflict
>> branch implements. Some of the following is copied and slightly adapted
>> from notes/tree-conflicts/use-cases.txt. See that file for reference
>> and some illustrative ASCII diagrams.
>
> Stefan,
>
> Thank you for this very clear explanation of what you have done.

No problem :)

> In these three use cases (file-rename conflicts during an update) you have
> successfully detected the conflict, reported it to the user, and made sure
> that a commit cannot occur until it has been marked as resolved.
>
> There is more work to do, of course, but do you know of any problems with
> your current implementation (other than the reporting of messages which
> Stefan Küng commented on) that would make it unsuitable for merging into
> the trunk?

This patch by Steve is an important bug fix for us and needs to be
reviewed and committed to trunk as time permits:
http://svn.haxx.se/dev/archive-2008-01/0601.shtml

I believe Steve is currently working on fixing another issue
on the tree-conflicts branch which involves working copy curruption,
I'll leave it to him to post further details on this one.

In any case, I think we should would wait with merging the tree
conflict branch into trunk at least until 1.5 is branched, and
I guess most developers agree with me on this one (especially
those trying to finally get it out the door ;)

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-01-29 02:27:57 CET

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