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

Re: Confused svn: Two dirs point to same dir in repo?

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-01-16 13:10:56 CET

On Fri, 14 Jan 2005 14:38:13 +0100, Kenneth Ahn Jensen <kenned@gmail.com> wrote:
> Hello
>
> I am currently using SVN for my thesis project, and this is the first
> time I am using SVN for anything larger than keeping track of a single
> file. :)
>
> /maindir/code/src
> - /dk/itu/kaj/client
> - /common
> /maindir/code/bin
>
> The src dir is of course my source files, and the bin dir is where the
> Java compiler stores the compiled class files. I have tried to tell
> svn to ignore the bin dir, without luck, and so at one point I tried
> deleting it from the svn repository. Somewhere in between, I think I
> may have committed the bin folder and named it src in the repo, so now
> svn thinks that both directories on the local disk points to the same
> dir in the repository, which is a bit messy.
>
> This is the output for svn info:
>
> [kaj@stud1-40 kaj]$ pwd
> /home/kaj
>
> [kaj@stud1-40 kaj]$ svn info speciale/code/xkms/src
> Path: speciale/code/xkms/src
> URL: svn+ssh://kajs.homeip.net/home/kaj/SVNROOT/speciale/code/xkms/src
> Repository UUID: abf86ed6-eb37-b740-8095-1edd75a7702e
> Revision: 39
> Node Kind: directory
> Schedule: normal
> Last Changed Author: kaj
> Last Changed Rev: 39
> Last Changed Date: 2005-01-12 23:50:40 +0100 (Wed, 12 Jan 2005)
>
> [kaj@stud1-40 kaj]$ svn info speciale/code/xkms/bin
> Path: speciale/code/xkms/bin
> URL: svn+ssh://kajs.homeip.net/home/kaj/SVNROOT/speciale/code/xkms/src
> Repository UUID: abf86ed6-eb37-b740-8095-1edd75a7702e
> Revision: 39
> Node Kind: directory
> Schedule: normal
> Last Changed Author: kaj
> Last Changed Rev: 39
> Last Changed Date: 2005-01-12 23:50:40 +0100 (Wed, 12 Jan 2005)
>
> [kaj@stud1-40 kaj]$
>
> This means that a svn status for the bin dir, shows that a lot of
> source files are missing... Which they should be! But if I do a "svn
> del" on the files, they get deleted from the repository, which they
> obviously shouldn't.
>
> How do I fix this? :-)

You can 'svn rm' the dir. Then commit. The dir will now be gone.

Then you can recreate the bin dir and add it to the svn:ignore
property of the parent.

> I am using svn 1.0.9 on Fedora 2 on the client side, and svnserve
> 1.1.0 on Mandrake 9.2 server side.

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 16 13:14:06 2005

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