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

Problems when updating a working copy against a repository in which an external link has been deleted

From: Dale Worley <dworley_at_pingtel.com>
Date: 2004-09-22 23:05:55 CEST

A directory in my working copy, sipXpbx/etc, contained an external link
named cert. Someone did an update to the repository, deleting the external
link. However, when I attempted to update sipXpbx, I received the error
message:

    svn: Won't delete locally modified directory 'sipXpbx/etc'
    svn: Left locally modified or unversioned files

The first problem is that the name of the directory in the message is
incorrect, as the directory that would be deleted is sipXpbx/etc/cert.

The second problem is that sipXpbx/etc/cert did not contain any local
modifications, as verified by 'svn status'. For that matter, neither did
sipXpbx/etc.

After a little investigation, it turned out that the problem was files in
the directory that had been generated, but were listed in svn:ignore, so
'svn status' did not report them. Once I had deleted all the files
mentioned in svn:ignore from sipXpbx/etc/cert, 'svn update' would delete the
directory.

So it seems to me that 'svn update' should be modified so that when it is
testing if a directory contains local modifications (and thus should not be
deleted), that it should ignore files that are specified in svn:ignore.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 22 23:46:10 2004

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