On Oct 2, 2008, at 7:05 AM, B Reed wrote:
> Hi I am using SVN for our project and came across a properties
> conflict which I am not too sure how to handle. I have a file in
> SVN called app.css I updated it recently but instead of a 'M' in
> status it is showing a 'C'. Upon further investigation I see that
> there is a file app.css.prej. I read in the book that this is a
> properties conflict and to investigate it by reading the .prej
> file. So here is what it says:
>
> Trying to change property 'svn:executable' from '*' to '*', but the
> property does not exist.
>
> Here is what I get when I do svn diff:
>
> Property changes on: app.css
> ___________________________________________________________________
> Name: svn:executable
> - *
>
>
> I am not sure what I am to do here. Should I add the property
> svn:executable to my app.css file? This to me to be unusual, since
> I have other files that are excutable, but I do not remember ever
> having to set the svn property for them.
>
> Perhaps I could just force commit it or use svn resolve --accept
> mine-full app.css?
I am not sure why the conflict occurred, since I don't know the
history of your repository. Presumably you made a property change to
app.css in your working copy, and before you were able to commit it,
you updated from the repository, where someone else made a different
property change to it. But if app.css is a cascading stylesheet, then
you don't need the executable bit set on it, so I would delete that
property with "svn propdel svn:executable app.css" and then tell
Subversion you resolved the conflict with "svn resolved app.css".
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-03 02:24:05 CEST