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

Re: [PATCH] Tree conflicts - svn info reporting per victim

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Sun, 12 Oct 2008 00:24:50 +0200

Julian Foad wrote:
> Patch in progress, for any comments.
>
> (Stefan, you were working on this some time ago, weren't you?)
>
> The attached patch modifies the reporting of tree conflicts by "svn
> info" so that "svn info path/to/victim" reports any tree conflict info
> about the victim:
>
> [[[
> $ svn info path/to/victim
> Path: victim
> URL: [...]
> [...]
> Tree conflict:
> The update attempted to edit 'pi'.
> You have deleted 'pi' locally.
> Maybe you renamed it?
> ]]]

You mean:
 The update attempted to edit 'victim'.
 You have deleted 'victim' locally.

(Sorry, haven't had the time to test it yet)
~Neels

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-10-12 00:25:53 CEST

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