2009/4/17 Andreas Mahel <andreas.mahel_at_gmx.net>:
> Stephen Connolly wrote:
>> 2009/4/17 Bruno Moreira Guedes <thbmatrix_at_gmail.com>:
>>
>>
>>> My employer said I have three days of life.
>>>
>>>
>>
>> You might be able to re-code three weeks work in three days with your
>> mangled workspace.... but as you never committed your changes,
>> subversion has not kept them for you :-(
>>
>> Get coding :-( and next time use a branch
>>
>> Sorry to be the bearer of bad news
>>
Sure, I was totally stupid by not using a branch...
>>
> How about:
>
> svn up -r xxx
>
> where xxx is the revision number of the last update before the
> accidental one (-> the one which you would have wanted to create the
> branch from, as Stephen wrote)
>
>
> This should roll back everything to the state of the former revision,
> except your changes, of course.
> I'm not sure about conflicts which have occurred during the accidental
> svn up, neither about heavier changes in the wc structure (like renaming
> files or folders etc.).
> Before trying this, I'd make a backup of my working copy first.
And I also was many more stupid by not making backup.
>
> Best regards,
> Andreas
>
>
But as stupid as many times has a bit of luck, I made a copy of the
directory after the accident. And, even more luck, by not open the
files in my copy of this IDE(Kdevelop), it does not overwrite the
backup files automatically when it does, which are not included in the
repository. After a long work to find a solution, I remember this
files by seeing them(the ones ended in '~').
But I still don't understanding how I do a 'svn resolved' before
looking at the different releases and my working copy, but I'll be
more careful.
Many thank you.
--Bruno Moreira Guedes
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1771065
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-17 19:00:21 CEST