Greg Ward wrote:
...
> Now here's where I started going wrong: somehow I thought that my
> working copy must have been switched to the new branch, so I'd better
> switch it back to the trunk. (I know, the logic is pretty thin, but
> there you go.) Here's what I did (and what svn responded with until I
> killed it):
>
> $ svn switch file:///home/svn/optik/trunk mkpydoc
> D mkpydoc
> A mkpydoc
> A mkpydoc/merge
> A mkpydoc/test
> A mkpydoc/test/test_optik.py
> [...]
> A mkpydoc/po/optik.fr.po
> A mkpydoc/po/optik.de.po
> svn: Caught signal
>
> Oops! Looks like I got the syntax wrong for the "switch" command,
> causing svn to clobber my working-copy mkpydoc (a file) with a directory
> containing my whole trunk. Oops!
>
> Aieee! At this point my reptilian hindbrain stepped in, and I
> immediately reverted to the instinctive response of any CVS user:
>
> $ rm -rf mkpydoc
> $ svn up
> svn: Can't open file 'mkpydoc/.svn/tmp/dir-props': No such file or
> directory
Right. So, bug number one, svn shouldn't hopelessly die if, when attempting
to restore a node from the server, it's node-kind isn't what the client
expects.
I'll check our bugtracker, and file a new issue/annotate an existing issue
as appropriate.
> Hmmm. So, svn does not like it when my reptilian hindbrain comes up
> with CVS-like behaviour. Maybe it's not too late to do the right thing:
>
> $ svn revert mkpydoc
> Failed to revert 'mkpydoc' -- try updating instead.
>
> Sigh. (Hey, how come that error message didn't start with "svn: " like
> all the other ones?)
Bizarre. Bug number 2, I guess.
> "svn cleanup" fails to resolve the situation. Any other ideas? My
> reptilian hindbrain wants me to edit .svn/entries and remove the entry
> for "mkpydoc", which by-the-way is this:
>
> <entry
> name="mkpydoc"
> kind="dir"
> schedule="delete"/>
Schedule delete? How did *that* get there?
Oh well. In this case, the hindbrain has the right idea. Delete that entry.
Also, make sure that the first <entry> of the file (which has name="" and
represents the directory itself) contains incomplete="true". Then "svn up",
and all should be well.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 30 13:55:23 2004