You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Dang Nguyen <ha...@comcast.net> on 2008/07/08 15:25:16 UTC

Revert doesn't revert mergeinfo properties

_First, my setup_
Server: SVN 1.5.0 (CollabNet binaries) on Windows Server 2003
Client: TortoiseSVN 1.5.0 on Windows XP Pro SP3

So, yesterday, I started a merge and had to revert all the changes 
before I committed the merge.  I initiated the revert from the top 
folder of my local working copy.  Everything seemed to revert fine, 
except when I tried to merge a second time for the same revisions as the 
first.  TortoiseSVN reported that there were no files to be merged.  
Digging deeper, I found that the folder's mergeinfo properties still 
listed the range of revisions from the first merge.  In reality, no 
merge was committed, and all of my local files had been reverted.

I couldn't find any way to edit the mergeinfo property and ended up 
deleting the entire local working copy and doing a fresh checkout.  
After that, I was able to merge and commit all changes successfully.