[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Rolling Back Changes

From: Files <files_at_poetryunlimited.com>
Date: 2003-11-15 21:25:20 CET

Can I see what your file tree looks like from the point at which you tried to
do whatever you did?

On a completely different note, if you want your rev 52 back, you have two
options.

Check out a new copy of rev 52 in a different directory.

Dump and reload everything up to rev 52.

I still don't get exactly what you were attempting to do. Didn't feel like
what you were trying to do was the supposed to be done w/ the commands you
typed.

Can you provide some more info?

-- 
Shamim Islam
BA BS
Dietrich Epp said:
> I was shocked to find out that most of the files in a directory of my
> project mysteriously disappeared in revision 53.  So I tried this:
>
> -----
> $ svn copy file:///path/to/repository/subdir/English.lproj/ . -r 52
> svn: Attempted to lock an already-locked dir
> svn: working copy locked: .
> svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
> details)
> -----
>
> I can't even figure out why the files disappeared in the first place,
> but I do know that Subversion is entirely to blame.  Here is some more
> text from my terminal:
>
> -----
> Updated to revision 52.
> $ ls
> English.lproj/  Hammer.icns  Level.icns  MaraLevel2D.nib/
> MaraLevel3D.nib/
> $ svn rm MaraLevel2D.nib/
> D         MaraLevel2D.nib/objects.nib
> D         MaraLevel2D.nib/info.nib
> D         MaraLevel2D.nib/classes.nib
> D         MaraLevel2D.nib
> $ svn ci -m 'Temporary.'
> Replacing      Resources
>
> Committed revision 53.
> -----
>
> I'm using subversion 0.33.0.  What's with the 'Replacing Resources'?
> (Resources is the directory that the files disappeared from.)
>
> On a side note, it's really ugly working with nib files in subversion.
> When I want to change a nib file, I have to move .svn directories
> around.  It would be nice if subversion were smart enough not to put
> .svn directories in nib files or other such places.  This is really
> important for Mac OS X developers, I'd rather have no move command than
> have such poor handling of nib files.
>
> On a side, side note... I couldn't find a link to subscribe to this
> list on the project page.  I guessed the email address for subscribing.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Nov 15 21:26:35 2003

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.