On Wed, 2004-08-25 at 14:35, Andrew Barber wrote:
> > svn update -r 100 foo.c
> D foo.c
> Updated to revision 100.
>
> Oops, that file didn't exist for that rev. Ok, makes sense that it
> should be removed from my WC. So lets go back to the HEAD revision for
> that file so I can have my file back.
>
> > svn update -r HEAD foo.c
> svn: 'foo.c' is not under version control
This is fixed in svn 1.1.
> > svn copy -r HEAD $REPO/trunk/foo.c foo.c
> > svn status foo.c
> svn status -v foo.c
> ? foo.c
>
Huh? That should absolutely work. In fact, it's the recommended way to
resurrect a file in svn 1.0.
Are you *sure* you didn't get an error when you ran the copy command?
I wonder if you didn't already have an unversioned file named foo.c "in
the way", in which case 'svn copy' would fail.
> Well, I guess that didn't work either.
>
> I give up, I'll just update the whole directory to get the file back. I
> really didn't want to do this as I spent some time updating different
> files to different revisions and I have local modifications I didn't
> want to merge yet.
>
> > svn update -r HEAD .
> U bar.c
> svn: Failed to add file 'foo.c': object of the same name already exists
>
Ah, I was right... there was an unversioned file blocking the copy.
> Oops the file from the copy is still there. If I hadn't done the svn
> copy I got:
> svn: Can't copy '.svn/text-base/foo.c.svn-base' to
> '.svn/tmp/text-base/foo.c.svn-base.tmp': No such file or directory
>
>
> So it seems as though I am wedged. I can't get this file back into my
> working repository other than starting over with a fresh new checkout.
> Any thoughts?
It's impossible to know the state of your working copy after all these
things you've done. Run 'svn cleanup', then show us the output of 'svn
status'.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 25 22:10:01 2004