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

Re: Accidental deletion caused breach in file history

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-05-29 14:26:57 CEST

On 5/28/07, Gias Kay Lee <gsklee.at.battlemaster@gmail.com> wrote:
> Hello,
>
> I am a new user to svn/tsvn. I just made a mistake I don't know how to
> correct. Here it is:
>
> I accidentally deleted a file in my local working copy, then I
> accidentally committed this change, causing the repository to lost
> that file as well. I recovered the lost file from a manual backup
> elsewhere within my hard disk, putting it into my local working copy
> and committing again, so the repository has regained the file.
>
> But now the repository recognizes this as a deletion of an "old file"
> and an addition of a "new file", despite being the same file of the
> same name and content. The file history is broken and I don't know how
> to relink it.
>
> Is there any solution to this problem? Thanks in advance.

You want to do a "reverse merge" - basically you do a merge from a
newer revision to an older one to undo the change. See
http://svnbook.red-bean.com/en/1.2/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.resurrect

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue May 29 14:27:19 2007

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