dev@glassfish.java.net

Re: ^M char in files

From: Tim Quinn <Timothy.Quinn_at_Sun.COM>
Date: Mon, 07 Apr 2008 08:34:01 -0500

I don't know if this has anything to do with the current issues in the
svn repository, but in the past I have seen this problem introduced in
files in the cvs repository if I - I mean, if "someone" - edited a file
on one platform, then copied the source to another platform for testing
and debugging, then checked in the file from the second platform, not
the platform on which the file had most recently been edited.

I am doing my work these days on a Mac, which adds yet another variable
into the situation. For me, a vi of AsadminMain.java (flagged as a UNIX
file by Byron's utility) and DatabaseCommand.java (flagged as a DOS
file) look the same - no explicit "^M" characters appear. NetBeans
shows the same results.

Is it possible that svn does the right thing so long as files are
checked in from the platform on which they were most recently edited? I
have not experimented with the svn config at all. I'm just throwing
this out there since this new ^M issue reminds me of the old one with cvs.

- Tim

Byron Nevins wrote:
> I'm not buying that the UNIX line terminator is "right" and the
> Windows line terminator is "wrong".
>
> But I think this is a problem. I wonder why cvs handles the
> conversion automatically and perfectly and subversion requires so much
> extra work/configuration?
>
> I wrote a program that tells you what "format" a text file is in.
> Here are the results for one directory I work in. This is from a
> straight svn checkout with no changes:
>
> AsadminMain.java: UNIX
> BackupCommands.java: UNIX
> BaseLifeCycleCommand.java: UNIX
> CLIProcessExecutor.java: UNIX
> CreateDomainCommand.java: UNIX
> DatabaseCommand.java: DOS
> DatabaseReporter.java: DOS
> DeleteDomainCommand.java: UNIX
> DerbyControl.java: DOS
> DummyCommand.java: UNIX
> HelpCommand.java: UNIX
> ListDomainsCommand.java: UNIX
> RemoteCommand.java: DOS
> RemoteCommandParser.java: UNIX
> S1ASCommand.java: UNIX
> StartDatabaseCommand.java: UNIX
> StartDomainCommand.java: UNIX
> StopDatabaseCommand.java: DOS
> StopDomainCommand.java: UNIX
>
> Sahoo wrote:
>> Thanks, Claudio. Yes, I was exactly referring to this in my last
>> reply. Let's hope Windows users use something like this going forward.
>>
>> Thanks,
>> Sahoo
>>
>> Claudio Miranda wrote:
>>> Those properties can be configured at svn client level, as you
>>> requested, see an example extracted from $HOME/.subversion/config
>>>
>>> ### Section for configuring automatic properties.
>>> [auto-props]
>>> ### The format of the entries is:
>>> ### file-name-pattern = propname[=value][;propname[=value]...]
>>> ### The file-name-pattern can contain wildcards (such as '*' and
>>> ### '?'). All entries which match will be applied to the file.
>>> ### Note that auto-props functionality must be enabled, which
>>> ### is typically done by setting the 'enable-auto-props' option.
>>> # *.c = svn:eol-style=native
>>> # *.cpp = svn:eol-style=native
>>> # *.h = svn:eol-style=native
>>> # *.dsp = svn:eol-style=CRLF
>>> # *.dsw = svn:eol-style=CRLF
>>> # *.sh = svn:eol-style=native;svn:executable
>>> # *.txt = svn:eol-style=native
>>> # *.png = svn:mime-type=image/png
>>> # *.jpg = svn:mime-type=image/jpeg
>>> # Makefile = svn:eol-style=native
>>>
>>> Claudio Miranda
>>>
>>> On Thu, Apr 3, 2008 at 11:35 AM, Sahoo <Sahoo_at_sun.com> wrote:
>>>
>>>> Thanks, Claudio. When new files are added, we have to again set the
>>>> properties, right? Can user use the auto-props setting in their svn
>>>> client
>>>> for all .java, .xml and other known extensions? That way, when new
>>>> files
>>>> are added, they are automatically taken care of.
>>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>
>