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

Re: tree conflict info

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 13 Aug 2009 13:49:09 +0100

Neels Janosch Hofmeyr wrote:
> Hi again Tree-conflicts folks,
>
> how about shortening the URLs in the "Tree-conflict" section of `svn info';
> patch attached. This is what it does:
>
> `svn info' on a tree-conflicted node with this patch looks like this, less
> the comments:
> [[[
> [...]
> URL: http://full.url/to/trunk/alpha [ <-- as usual... ]
> [...]
> Tree conflict: local edit, incoming delete upon update
> Source left: (file) ^/trunk/alpha_at_1 [ <-- these URLs ]
> Source right: (file) ^/trunk/alpha_at_2 [ <-- were shortened ]
> ]]]

Nice.

> [...], when the current node kind is absent,
> `svn info' is pretty quiet; this would be a whole info:
>
> [[[
> $ svn info m201b7297/trunk2/alpha
> Path: m201b7297/trunk2/alpha
> Name: alpha
> Node Kind: none
> Tree conflict: local delete, incoming delete upon update
> Source left: (file) ^/trunk/alpha_at_1
> Source right: (none) ^/trunk/alpha_at_2
> ]]]
>
> I'd say it is still okay to use the caret notation. The parent dir's URL is
> available from the working copy. The benefit of readability outweighs the
> lack of full info.

I agree.

> There won't ever be a different repository's URL in there, will there.

In a cross-repository merge? But I don't think we need to handle that at
the moment, do we?

Patch looks good. +1.

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383271
Received on 2009-08-13 14:49:30 CEST

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