On 10-05-27 01:25 PM, Johan Corveleyn wrote:
> On Thu, May 27, 2010 at 12:55 PM, Ulrich Eckhardt
> <eckhardt_at_satorlaser.com> wrote:
>>
>> The repository is stable, I think you mean the working copy. I guess that you
>> have local, unversioned files in your local "folder_name". Those are not
>> moved with the versioned files, so after the first step you have two folders.
>> Then, the newly created versioned folder can't be created, because the local
>> unversioned one is in the way.
>>
>> In any case, as with most problems with a working copy, just deleting it and
>> checking out again typically does the job.
To Ulrich:
I did this a couple of times in the past, but the conflicts keep coming
back.
>
> No, no, that's not necessary at all. Your working copy isn't corrupt,
> you just have a tree conflict that you need to resolve, that's all.
To Johan:
when I run svn status on the first conflicted dir, it tells me that a
subdirectory is missing (i get the "!" code in the status). However, the
directory is there and is identical to the one i get with a fresh
checkout. The .svn files are slightly different in the subdir: in the
problematic local copy there is an "incomplete" keyword at a certain
point of the "entries" file, and above it the revision numbers are lower
than in the freshly checked out copy.
The freshly checked out copy doesn't show conflicts, but I've seen this
before: after a number of updates and commits the conflicts come back.
Perhaps there is another broken working copy that commits the conflicts
back, after I have solved them on my own copy. This is a large svn
repository used by a whole lab.
Thanks to both for the fast answers!
Giampiero
Received on 2010-05-27 15:05:20 CEST