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

Re: 'svn revert' vs. 'svn resolve'

From: Brian Denny <brian_at_briandenny.net>
Date: 2003-06-06 22:21:31 CEST

On Fri, Jun 06, 2003 at 02:13:17PM -0500, Ben Collins-Sussman wrote:
> Solution 3: when reverting a conflicted file, leave the already
> existing '.mine' file behind.
> * but now we have extra unversioned files littering the wc,
> even when we legitimately run 'svn revert conflicted-file'.

... which could then be cleaned up by running "svn resolve", ya?

sounds good to me.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 6 22:15:56 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.