Re: Revert to previous version issue

On 25.10.2011 17:01, Robert O'Keefe wrote:
> I am seeing some unexpected behavior in Subversion starting with version
> 1.7 when I try and get old versions of files. Here's what I'm seeing:
>
> Steps:
> 1. Right click on a file. Select TortoiseSVN>Show Log.
> 2. Select a revision for the file. Right click on the revision and
> select update item to revision.
>
> Actual result:
> An update is performed followed by a delete.
>
> Expected result:
> An update is performed. The file is not deleted.

Works fine for me. Are you sure the file is still there in that revision
and hasn't been renamed?

>
> ----
>
> Steps:
> 1. Right click on a file. Select TortoiseSVN>Show Log.
> 2. Select a revision for the file. Right click on the revision and
> select revert to this revision.
> 3. Select yes to the message that shows up.
> 4. On the resolve conflict screen that pops up click prefer repository
>
> Actual result:
> The file that is local is not changed.
>
> Expected result:
> The file from the repository is brought down to the machine and replaces
> the local file.
>
> The only way I can make this work is to use the Save Revision to option.

Using "prefer repository" only means that the *conflicting change* is
used from the repository. All other, non-conflicting changes are still
merged so your file still has local modifications.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2863514
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].