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

Re: SVN status indicating a file is modified when it's not.

From: Bill Williams <billwilliams_at_qcsoftware.com>
Date: 2006-03-29 15:48:19 CEST

Thanks for the suggestion. Since we are talking about hundreds of
source code files, is there an easy way to set the property without
doing it one file at a time.

Also, just to mention another odd thing about this. If I make a change
to the makefile and commit it on windows myself, "svn status" does not
show the file is modified after the commit even though it is still the
situation where the file itself if in DOS format while the text-base
file is in unix format. It only seems to be a problem when files are
updated via the "svn update" command.

Ryan Schmidt wrote:

> On Mar 28, 2006, at 21:03, Bill Williams wrote:
>
>> We have a mixed environment. Our server is linux and our
>> workstations are windows accessing the linux server via samba. When
>> I first created the various workspaces, I checked everything out
>> under linux. All source code files and makefiles have the eol- style
>> set to native; therefore, all of files are in unix format with the
>> lines ended with a newline character.
>>
>> Since the initial checkout, changes have been made to both source
>> code and makefiles. These changes are usually performed under
>> windows and committed to the repository via Tortoise.
>>
>> I will then update my particular workspace using Tortoise and this
>> is where the problem now appears. Under linux, an "svn status"
>> command shows no modifications which is correct. But under Windows,
>> it will say the makefile has been modified. It does this with both
>> the "svn status" command and Tortoise. I looked at the files that
>> were changed and I have found the newly updated source files and
>> makefiles are now in a DOS format with CR/LF on the end of the
>> lines; however, the base files in the .svn/text-base directory are
>> all still in a unix format. What I find interesting here is the
>> source files do not show that they have been modified, only the
>> makefiles when this occurs.
>
>
> I think if you're going to have a working copy that's used both from
> Windows and from Unix then you shouldn't use svn:eol-style=native
> because it'll just confuse Subversion, as you're seeing. I'd set
> svn:eol-style to either DOS-style or Unix-style line endings,
> whatever you need, and then ensure that your editors on both Unix and
> Windows use this line ending style.
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 29 15:51:36 2006

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