[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: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 16 Jan 2008 18:52:54 +0100

Quoting Stefan Küng <tortoisesvn_at_gmail.com>:

> Stefan Sperling wrote:
> [snip]

>> B can now run "svn info" on the tree-conflicted directory to inquire
>> about the conflict, and decide what action to take to resolve it, possibly
>> discussing the proper fix with A.
>> $ svn info /tmp/wcB
>> Path: /tmp/wcB
>> URL: file:///tmp/repo
>> Repository Root: file:///tmp/repo
>> Repository UUID: eb86d84e-d4f0-407f-a0df-a893da9c5563
>> Revision: 2
>> Node Kind: directory
>> Schedule: normal
>> Last Changed Author: stsp
>> Last Changed Rev: 2
>> Last Changed Date: 2008-01-16 16:31:37 +0100 (Wed, 16 Jan 2008)
>> Tree conflicts:
>> The update edited the file 'Foo.c'.
>> You have deleted 'Foo.c' locally.
>> Maybe you renamed it?
>> Note the last few lines in the output. (Whether this is the right
>> place to put this information, and whether it has the right format
>> is still open for debate. See
>> http://svn.haxx.se/dev/archive-2008-01/0098.shtml)
> Why does only 'svn info' show the hint? I would prefer if that hint
> would be shown in the failed commit. After all, that's what the user
> wanted to do and failed, and showing the user *why* it failed should be
> done in the commit error message.
> I guess I could do that in TSVN by calling svn_client_info() after a
> failed commit, but I think most clients would want that info in the
> error message, so IMHO it should be done in the svn library.

Hi Stefan,

Our original plan was to write the human-readable descriptions of all the
tree conflicts in the commit error message.

Unfortunately the svn client's error messages are not allowed to
exceed 50 characters, and newlines are forbidden, so we had to find
another place to
write the text.

The all-too-brief "remains in conflict" error message is currently used in
the case of text or property conflicts, so we use it too.

That said, we're open to suggestions for a better way to supply the full
conflict description to clients.


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-01-16 18:53:38 CET

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