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

Re: How to fix missing or not locked directory?

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-11-05 17:24:10 CET

On Nov 5, 2005, at 00:44, James Wilson wrote:

> I am using subversion to give revision control to the files
> generated from an EDA tool that I use. I have a directory, with
> several subdirectories, that are generated by the EDA tool. They
> have all been added to the repository. While using the tool, one
> of the subdirectories was deleted and then recreated. Now here is
> the problem.
> The new subdirectory contains the new data that I want to update
> the repository with. But the directory is not part of the working
> copy because it was deleted and recreated. IE, There is no .svn
> subdirectory in it. If I try to add the directory back to the
> repository, this is what I get:
> $ svn add gnd_esd_30u/layout/
> svn: warning: 'gnd_esd_30u/layout' is already under version control
> $ svn commit gnd_esd_30u/layout/
> svn: '/home/james/cadence_kf1/K_F1_design_database_p1a/gnd_esd_30u/
> layout' is not a working copy
> I don't want to do a svn update gnd_esd_30u/layout becuase it would
> overwrite all the changes that were made. So how do I keep this
> new subdirectory with all the new files in it, and add it back into
> the subversion repository?

Move the newly created directory out of the way (rename it "layout-
new" for example). Now revert the layout directory. This will restore
the version that last existed. Now manually transform the old layout
directory into the new layout-new directory, by adding, removing or
modifying files and/or directories. Now commit the layout directory,
and delete the no-longer-needed layout-new directory.

Avoid allowing the EDA tool to do this in the future. Encourage the
manufacturer of the tool to rewrite their software so that it does
not delete the directory but instead just manipulates the files in it.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Nov 5 17:26:37 2005

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.