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

Re: [TSVN] Restoring a deleted file, improvement request

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-08-09 19:39:08 CEST

Nathan Kidd wrote:

> 1. Show Log from your WC
> 2. Click on a revision with a deleted file (e.g. r123)
> 3. Right click *the deleted path* (e.g. /path/file.ext) and and choose
> "Revert changes from this revision"
>
> Result:
> Error: File not found: revision 123, path '/path/file.ext'
>
> Expected result:
> The file is copied from r122 to the WC.
>
> In other words, for deleted paths TortoiseSVN should use the previous
> revision number, not the current.

Done in revision 4106.
But note: the reverting can't be done with the svn_client_merge() API
because the file doesn't exist in that revision anymore, and the file
also doesn't exist in the wc (so nothing to apply a diff to!).
So I changed it so that if a file is deleted in that revision, an
svn_client_copy() is done instead from the URL@rev-1 to the working copy.

> This also affects the "Save As..." and "Show Log" context menu items for
> deleted paths.

Done in revision 4107 for Save As. I won't change it for "Show Log",
because svn_client_log() doesn't take a peg revision yet. And just
showing the log from rev-1 on instead of rev isn't a good idea because
the log wouldn't show that the file has been removed.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Aug 9 19:40:19 2005

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