[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 25 Oct 2011 21:38:01 +0200

On 25.10.2011 21:28, Robert O'Keefe wrote:
> I have attached a screenshot with images and the steps to reproduce
> both issues. Please let me know if you need additional information.

So you just showed me that my answers before were correct:

in the first situation: you show the log for the branch, but then update
to a revision on the trunk where the branch didn't exist yet. That's why
the file gets deleted.

in the second situation: you reverse merge to a revision where the file
doesn't exist. So the merge conflicts. You choose the file in the
repository, which is your original file.
So there won't be any modifications to that binary file.

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=2863569
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-25 21:38: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.