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

Re: [Subclipse-users] Handling Duplicate Directories

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 12 Mar 2008 11:10:58 -0400

On Wed, Mar 12, 2008 at 12:08 PM, Zack Grossbart <zgrossbart_at_novell.com> wrote:

> This is more of a general Subversion question, but I thought I would try it
> here first. I can do the following scenario with the command line client:
>
> 1. Alice and Bob check out the same directory.
> 2. Alice creates a directory named foo and a file named foo.txt in that
> directory.
> 3. Alice adds the new files locally and checks in.
> 4. Bob creates a directory named foo and a file named foo1.txt in that
> directory.
> 5. Bob adds the new files locally and tries to check in.
> 6. Bob's check in fails with the message "File already exists: filesystem".
>
> The problem is Bob is stuck now. If Bob just renames the file and tries to
> check in Subversion will complain that the directory is missing since it is
> referenced in the .entries file of the parent directory. However, if Bob
> tries to move the directory using svn mv Subversion will complain, "Cannot
> copy or move 'foo': it is not in the repository yet; try committing first."
>
> Bob is sort of stuck at this point. The only thing I think he could is to
> edit the .entries file by hand to remove the foo directory and then rename
> it outside of Subversion. I can't believe that is the only solution. Is
> there a better way to resolve this conflict? Bob could try to check the
> revision numbers before he checks in or look on the server to see if any of
> the files he is trying to create already exist there, but that seems
> excessively slow. Any tips on a better solution?

In 1.5, I believe you will be able to do an update in this situation
and it will fix things. In 1.4 you should do Revert, which will fix
the entries file. Then rename and add again.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-03-12 16:11:10 CET

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