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

Re: Merge, directory still here

From: Michael W Thelen <thelenm_at_cs.utah.edu>
Date: 2004-10-15 18:40:25 CEST

Manuel VACELET wrote:
> I got a probleme with a marge today.
> I made a merge that should delete some files and directories in my WC.
> Files are deleted but directories mark as 'D' during merge are still
> present.
> ex:
>
> $> svn merge
> ...
> D TP/www/mirrors/index.php
> D TP/www/mirrors
> D TP/www/mirrors
> ...
>
> $> ls TP/www
> ...
> mirrors
> ...
>
> I miss somthing ?

When you "svn rm" a directory, it is scheduled to be deleted but remains
in place until you issue "svn commit" (this makes the change revertable
if you change your mind). Once you commit, the directory should really
go away.

-- 
Michael W Thelen
It is a mistake to think you can solve any major problems just with
potatoes.       -- Douglas Adams

Received on Fri Oct 15 18:44:58 2004

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.