Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: tree conflict info

subversion
Discussion topic

Back to topic list

Re: tree conflict info

Author julianfoad
Full name Julian Foad
Date 2009-08-13 05:49:15 PDT
Message 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@1 [ <-- these URLs ]
> Source right: (file) ^/trunk/alpha@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@1
> Source right: (none) ^/trunk/alpha@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

« Previous message in topic | 2 of 7 | Next message in topic »

Messages

Show all messages in topic

tree conflict info neels Neels Janosch Hofmeyr 2009-08-12 19:32:09 PDT
     Re: tree conflict info julianfoad Julian Foad 2009-08-13 05:49:15 PDT
         Re: tree conflict info stsp Stefan Sperling 2009-08-13 07:19:31 PDT
             Re: tree conflict info markphip Mark Phippard 2009-08-13 07:21:32 PDT
                 Re: tree conflict info cmpilato C. Michael Pilato 2009-08-13 07:46:41 PDT
                 Re: tree conflict info stsp Stefan Sperling 2009-08-13 08:24:12 PDT
                     Re: tree conflict info neels Neels Janosch Hofmeyr 2009-08-14 13:00:45 PDT
Messages per page: