On Nov 15, 2003, at 12:25 PM, Files wrote:
> 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.
I'm trying to copy the revision 52 version of
/trunk/Hammer/MacOSX/Resources/English.lproj/
into the working copy. But I guess I could just roll back to rev 52.
The part I don't understand at all is how the contents of the Resources
directory got wiped out. I was in the Resources directory and typed:
$ svn rm MaraLevel2D.nib/
$ svn ci -m 'Temporary.'
I was doing this because I created a new MaraLevel2D.nib. It's a
misfeature in Subversion that when I delete a directory the directory
isn't actually removed until the change is committed, meaning I can't
add a new directory of the same name. This means I have to make two
commits to replace nib files.
I couldn't reproduce the bug that wiped out my Resources directory.
On Nov 15, 2003, at 2:45 PM, Ben Collins-Sussman wrote:
> On Sat, 2003-11-15 at 13:34, Dietrich Epp wrote:
>> I was shocked to find out that most of the files in a directory of my
>> project mysteriously disappeared in revision 53.
>
> Run 'svn log -r53 --verbose'. It will list the exact changes made in
> r53. If you don't like the change, roll it back in your working copy,
> and commit the "undo" as r54. Read chapter 4 in the book about how to
> use 'svn merge' to do this.
I was trying to roll back the change by copying the revision 52
directory into its location. The log just shows the same thing I sent
in the last message, you saw what I typed. I'm not trying to roll back
everything, and I don't want to deal with merging it. I just want to
copy the files back into the directory.
Anyway, I just rolled (with dump/load) back to rev 52 and I'm redoing
the changes I made since then.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 16 00:27:36 2003