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

Re: Revert to previous version issue

From: Felix Saphir <felix.saphir_at_kantarmedia.com>
Date: Wed, 26 Oct 2011 10:22:54 +0200

Am 25.10.2011 23:16, schrieb Robert O'Keefe:
> I wanted to revert the file that I selected back to revision 18311.
> However, I am working on the branch and the revision I selected is on
> the trunk. The only way I could figure out how to accomplish what I
> wanted was to choose Save Revision To... and then overwrite my local
> copy of the file.

I'm sorry, but "revert back to revision x" isn't very well defined,
since there probably isn't a version of it at revision x, right?
Subversion keeps track of the changes to a file, and the file on trunk
and the one on branch are different files. If they have a common point
in history (and I assume they have), you could merge the changes, i.e.
apply the changes to the one on trunk to the one on branch. You might
need to undo changes to the file on branch before that.

You could, of course, just check out trunk @ 18311, copy the file over
to your branch (regular copy, not svn copy), and commit.

Felix

P.S: Please quote some context in your replies.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-26 10:23:15 CEST

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

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