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

Re: [TSVN] "Revert Changes From This Revision" Not Following Renames, Command Line Does

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-07-14 20:50:50 CEST

Nathan Kidd wrote:
> I have found a case where TortoiseSVN will not perform a merge that goes
> across a rename/move, but the command line client will do it.
>
> TortoiseSVN 1.2.0 3886 (latest nightly)
> svn.exe 1.2.0 (r14790) (official release)
>
> Steps:
>
> 1. commit a file (rev 1)
> e.g. file:///C:/myrepo/mergeme.txt
> 2. modify this file with "the bad changes" and commit (rev 2)
> 3. move this file to a different directory in svn and commit (rev 3)
> e.g. to file:///C:/myrepo/trunk/mergeme.txt
> 4. Show Log on this file, click on the revision with "the bad changes"
> and select "Revert changes from this revision"
>
> Result, e.g.:
> Error: File not found: revision 2, path '/trunk/mergeme.txt'

TSVN does that merge like
svn merge -r2:1 file:///C:/myrepo/trunk/mergme.txt
which means (since its the log dialog and it doesn't know that the file
you've selected for reverting still exists in the working copy (yes, it
*could* know, but that very complicated and requires an analysis of the
whole logs up to that revision).

> However, if on the command line I cd to the trunk working copy and:
> svn merge -r2:1 mergeme.txt
> It successfully undoes the changes.

Here, Subversion uses the working copy as the peg revision, so the merge
succeeds.

But you can use the TSVN merge dialog which will work if you use the
working copy paths there too.

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 Thu Jul 14 20:51:11 2005

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