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

RE: Re: Re: svn update fails quietly

From: Andy Stromme <astromme_at_appareo.com>
Date: Wed, 13 Apr 2011 15:51:48 -0700 (PDT)

> >> What do you mean by 'restore revision 885'? There is no such command
> >> in the menus so you must mean something different.
> >
> > By "restore" I mean I replace the file by hand; i.e. out of band of SVN - using windows explorer, I drag the file out of a different directory back into my workspace.
>
> Then it has not left r885 as the latest. What you have is r934
> modified to look like r885. You should see a red overlay icon to show
> you that there are changes and if you use check for modifications then
> you will see that the file is at r934 with local changes. TSVN diff
> will show you what those changes are.
>
> If update just replaced your local version with the latest from the
> server then it would destroy any work you had done.

You are correct sir - my mistake.

I have the svn overlay icons off, thus my confusion. I'm switching back and forth between svn and hg, which got me into this state which you described.

Thanks for the quick responses,
- Andy

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2719589

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-14 00:51:54 CEST

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