Decided the signs did not augur well for continuing to use this repo and
conserve the history. (i.e. I'm boned.)
So, I got the latest files from my colleague (he'd been making more changes than
I), and imported them into the repo. Of course, it continued with the same
sequence of revision numbers, as I hadn't created a new repository, but simply
reused the same one I had trashed by deleting some magical directory.
I then used WinMerge to compare my old WC with the new one, merged my changes
into the appropriate files, and committed the changes to the repo. (I *LOVE*
WinMerge!)
Note to self: don't delete shit you don't know, just because you don't know it.
It could be a magical directory. (Stoopid muggles!)
A. Alfred Ayache
http://lphs76.ca - Reunion community
http://www.rentersPlus.com - Apartment Search
http://www.lastbyte.ca - Web Design, eCommerce, PHP/MySQL, Java, Oracle
A. Alfred Ayache wrote:
> Brilliant suggestion, Peter. And the only thing to come out were two
> empty directories: branches and tags. :(
>
> Am I boned? ( <-- Futurama fan )
>
> A. Alfred Ayache
> http://lphs76.ca - Reunion community
> http://www.rentersPlus.com - Apartment Search
> http://www.lastbyte.ca - Web Design, eCommerce, PHP/MySQL, Java,
> Oracle
>
>
> Peter McNab wrote:
>> A. Alfred Ayache wrote:
>>> I was adding a directory to my working copy. Playing around with one
>>> way of adding some functionality, vs another. I had "added" the
>>> directory and some of the files to the repo, but not committed them.
>>>
>>> Then I decided to delete them and start over. Same directory name,
>>> but not added.
>>>
>>> Then I tried browsing the repo using the TSVN browser. I found an
>>> unnamed directory just under trunk. I tried exploring it, but there
>>> was nothing inside. So I deleted it. (That was probably not the
>>> right thing to do.)
>>>
>>> Now I can't add the new directory to the repo, and I can't update my
>>> WC. I keep getting "Working copy locked" and "Please execute the
>>> "Cleanup" command." And when I run Clean Up, I get that the new
>>> directory is not a working copy directory.
>>>
>>> I hope there's some way to fix this...
>>>
>>> I have a more or less usable copy of the project. And I have another
>>> copy offsite, with another developer.
>>>
>>> Thanks for your help,
>> You should be able to do a fresh "Checkout" to another location and
>> see what the current situation is in the repository.
>> It's a much safer option to make changes locally to an up to date
>> working copy (WC) and commit then rather than using the repo browser,
>> because then your WC cannot be committed until you do a fresh update.
>> Just be aware too that file and folder names are case sensitive in the
>> repository but not on your Windows box.
>>
>> Peter
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
>> For additional commands, e-mail: users-help@tortoisesvn.tigris.org
>>
>>
>> --------------------------------
>> Spam/Virus scanning by CanIt Pro
>>
>> For more information see
>> http://www.kgbinternet.com/SpamFilter.htm
>>
>> To control your spam filter, log in at
>> http://filter.kgbinternet.com
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: users-help@tortoisesvn.tigris.org
>
>
> --------------------------------
> Spam/Virus scanning by CanIt Pro
>
> For more information see
> http://www.kgbinternet.com/SpamFilter.htm
>
> To control your spam filter, log in at
> http://filter.kgbinternet.com
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Dec 27 15:56:42 2006