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

Re: Clobbering source file through merge -- can I recover?

From: John Allen <john.allen_at_classesarecode.net>
Date: 2006-02-02 15:35:30 CET

On Mon 23 Jan 2006 10:03, jetvm wrote:
> But what happens, if the svn update can merge the file without a
> conflict? Then I do not get the .mine and the two .rXX files. SVN
> changed my work, and i can not go back to the file I had. Is this right?
>

NO. svn revert, that is as long as you have not done an svn commit.

-- 
John Allen                          mailto:john.allen@classesarecode.net
Classes Are Code                    http://www.classesarecode.net
Mandriva Linux release 2006.0 (Official) for i586, kernel 2.6.12-12mdksmp
 14:35:29 up 5 days,  3:56, 15 users,  load average: 0.17, 0.18, 0.25
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 2 22:24:01 2006

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