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

[TSVN] Re: Strange icon overlay

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-11-10 09:54:22 CET

Lübbe Onken wrote:
> Now I know what went wrong with my working copy. The "Obj" Directory
> is supposed to be under version control, so that anyone can checkout
> the project and compile it without having to create subfolders
> manually.

Can your makefile create the Obj directory, or is this IDE land?

> At the same time the directory is ignored so that compiler
> generated files are not shown in the commit dialog.

Well you could set the properties of Obj to ignore * instead of ignoring
Obj itself in the parent folder.

> What happened was that the ".svn" folder inside "Obj" got removed
> accidentally. This caused TSVN to show a conflict icon for the "Obj"
> folder which is actually not a bad idea in this case :-)
> So now you got a recipe...

... for correct behaviour. To SVN it looks like the versioned Obj is
missing and there is a user-created folder of the same name, which would
be a genuine conflict.

You should go away and read the manual ... wait a minute, you wrote the
manual ;-)

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 10 10:17:05 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.