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

Re: TSVN equivalent of svn copy -r

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-09-26 23:18:25 CEST

Sven Probst wrote:
> I tried to revert a excel file - let's call it table.xls - in a
> working directory to a former revision (revision formerRev) and commit
> it in order to discard all changes after this revision. When using
> "Update to revision" or "Switch" the file in the working directoy really
> reverted to revision formerRev but there was no possibility to commit
> the working directory because subversion / TSVN recognised no
> modification. So I think this is the wrong way.
> Using table.xls' log message dialog and right-clicking "Revert to this
> revision" results in a conflicted state even though the file was not
> modified before. Not what I wanted, too.

This is the correct way to do it. Subversion tries to merge the
differences between the two versions to convert the WC copy back to the
earlier revision. But as the file is binary, the automatic merge fails
and you get a conflict. What you have to do next is open the 'check for
modifications' or 'commit' dialog, right click on the file and select
'resolve using theirs', which overwrites the content with the older version.

It would be nice if that could appear in the main context menu for
conflicted files, but maybe that has to wait until sub-menus get
implemented.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Sep 26 23:17:55 2006

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