[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sun, 12 Oct 2008 00:21:37 +0100

On Sun, 2008-10-12 at 00:24 +0200, Neels J Hofmeyr wrote:
> 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.

Yes, that's what I meant. Sorry for the sloppy cut-and-paste.

- Julian

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-12 01:49:05 CEST

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