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

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

From: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2005-07-14 19:39:51 CEST

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'

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.

-Nathan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 14 19:41:05 2005

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