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

Re: Unable to restore branch

From: Robin Guest <robin.guest_at_gmail.com>
Date: Thu, 15 Oct 2009 19:38:06 +0100

2009/10/15 McArthey.Mark <Mark.McArthey_at_we-energies.com>

> I'm just getting started with Subversion/Tortoise. I have created a
> branch that is visible in the repo-browser under my branches folder.
> Within the folder I've created another folder titled ISR101290. Within
> that folder exists the branched file. It is currently at revision 1318.
> If I check the trunk the file is at revision 1311.
> I'm having a problem where the file in the working directory does not
> exist. I have tried numerous ways to put the file into the working
> directory but it keeps telling me it is "obstructed". I have tried
> various combinations of update/commit/revert/copy to/export/checkout ...
> etc etc. I am unable to put the file that I can see in the repo-browser
> back into the working directory.
>
> Most recently I have right-clicked on the branches/ISR101290/ folder and
> tried to checkout the file back into the working directory (\OMS in the
> output below). It tells me I need to run update. I run update and am
> told to run cleanup. I run cleanup and it fails. I have been stuck in
> this loop for a couple of hours and am unable to determine how to
> recover from this.
>

I had something extremely similar to this the other day. I *think* what
worked finally was:

- get a safe copy of it from the repobrowser
- delete it directly in the repobrowser
- update the wc
- commit as many of the files in the wc as I could without it complaining
- commit the remaining files as a separate revision
- copy the saved file back into the wc
- re-add the saved file
- commit the saved file.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2407986

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-15 20:38:08 CEST

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