[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-05-29 18:13:38 CEST

Gias Kay Lee 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.

Since you already committed your file from the backup (why did you do
that? You're working with version control here), you now have to delete
that file again (it's a 'new' file, not the one with all the history you
want).
Then, open the repository browser. Change to the revision you last had
the folder/file. The repository browser will show you that folder.
Right-click on that folder, choose "Copy to working copy", then select
the path in your working copy where the folder/file belongs.
You will see that those files/folder are now marked as 'added' in your
working copy - but it's not a simple add, but an add-with-history.
Commit your changes and you're ok again.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue May 29 18:14:19 2007

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