Ryan Schmidt wrote:
> On May 12, 2006, at 23:14, Mark Gibson wrote:
>
>> so i went to make my first tag in svn and I see the way its done is
>> to have both
>> a trunk and tags directory. So I made a trunk directory and am trying
>> to move
>> directories into it. So I started with my doc directory, and I think
>> the error I
>> made was that I issued a "svn move doc trunk" and then an "svn delete
>> doc" and
>> then aaa svn commit (woops) and this seems to have flumoxed svn or at
>> least me.
>
> Yes, after moving it, you should not have tried to delete it from the
> previous location. Perhaps you got the idea that you needed to do this
> because the "doc" directory remained in the old location, and also
> appeared in the new location. In fact, the old "doc" directory should
> now be empty except for the .svn directory and its contents, which are
> required for Subversion to keep track of its impending doom. Once you
> commit the move, the old "doc" directory will go away.
>
> Assuming you have not been able to commit this yet, you still have a
> move and a deletion scheduled in the working copy. The move is what you
> want to do. The delete is not. You should undo the scheduled deletion,
> which is done by saying "svn revert doc". Then the only thing scheduled
> should be the original move, which should now be able to succeed.
thanks for the quick response. ok that worked sortof. i did a svn revert, and
then did a commit and the files in the doc directory were deleted. but the doc
directory remains. if i do a svn delete of the doc directory and svn commit i
get that error again. also my .svn/entries still seems to have doc in it:
<entry
name="doc"
kind="dir"/>
so if i do svn revert doc again at least it gets me in a state where i can do
commits. but is there someway i can actually delete that doc directory?
sourceforge website seems to be down, so i couldnt go through there svn viewer.
but i moved the doc directory and did a svn update to see if in fact it would be
updated - and it was - i got an empty doc directory. not the end of the world
but it would nice to delete.
oh actually i got it. after the moving and the updating, i then did a delete and
it was gone, so i mustve got it in a funky state and the mv & update helped
restore it somehow. thanks for your help, mark
and now my entries says this so i think im good:
<entry
name="doc"
kind="dir"
deleted="true"/>
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 12 23:51:28 2006