Scott Palmer wrote:
<SNIP>
> I had a case today where I went to commit my changes to Subversion, and
> I got a message that my working copy was not up to date. So I issued a
> 'svn up' command with the intention of trying my commit again. At this
> point things went horribly wrong because the update was unable to deal
> with the read-ony files that it was trying to replace. The update
> aborted part-way through. As part of the update one of my files needed
> to merge, since I was making changes to it it was not read-only.
<SNIP>
> The svn cleanup command would not complete. The working copy was stuck
> in a locked state. I could not properly update or commit.... So then
> I decided to be brave and poke around in the ".svn" folder to see if I
> could make it go. Sort of like wacking a piece of high-tech equipment
> on the side when it acts up - sometimes it works, sometimes you just
> break it more :)
>
> I broke it more.
I also had this experience a few weeks ago, when copying files from a
VSS working copy to my svn working copy and trying to commit. It failed
in the same way. I went down the same path as you (remove read-only, try
svn cleanup, poke around in .svn).
I finally got around the problem by doing a checkout of the same svn
tree in a separate location and then used that fresh .svn directory to
replace the corrupted one. This presumably looses any special meta info
about a mixed revision WC, scheduled adds/deletes, etc., but in my case
all I had to do was re-add the new files I'd copied into the WC and it's
been working fine ever since. A hack, but it beats the merge/conflict
gymnastics you described.
The svn code should check if a file is read-only before attempting
whatever it has to do for the commit, rather than plowing ahead,
failing, and essentially breaking your WC.
-Nathan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 7 21:58:18 2004