[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: Hugh Winkler <hwinkler_at_betweenmarkets.com>
Date: 2003-06-08 20:33:12 CEST

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Friday, June 06, 2003 2:13 PM
To: SVN Dev List
Subject: 'svn revert' vs. 'svn resolve'

[[hvw]] <snip>

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'.

[[hvw]] In CVS I have found this behavior profoundly comforting when
cvs up -C ChangeHistory.html
(Locally modified ChangeHistory.html moved to
U ChangeHistory.html

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 8 20:34:27 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.