Login | Register
My pages Projects Community openCollabNet

Discussions > users > Line endings

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

RE: Line endings

Author pilotbob
Full name Bob Archer
Date 2011-06-28 06:56:15 PDT
Message > On 27 Jun 2011, at 09:13, Simon Large wrote:
>
> >
> > I'm not sure that the line ending is changed on existing files in
> your
> > WC. If that property is already set in the repository copy, what
> > happens if you delete the local copy of the file and then update
> to
> > force a fresh copy to be created?
> >
>
> Unfortunately, I've made changes to many of the affected files so I
> can't test that until I can check in the changes (not for a few
> days at least). However, I'll bear that in mind Simon.
>
> Having said that, my recollection is that it does update files in
> my local copy. It certainly produces some output which makes it
> look like that's happening - and it correctly identifies files
> which aren't under SVN control and leaves them alone. I also
> remember (from about a month ago) having problems with some files
> that were being detected as "locked" and I needed to do a cleanup
> before I could get those ones to work - but they did work in the
> end. I'm still inclining towards the view that these files are
> somehow being detected as binary files.
>
> John

Is there an svn:mime-type property on the files? If so, then svn things they are binary. If there is no mime type is assumes they are plain/text.

BOb

Re: Line endings

Author Dale McCoy <dalestan at gmail dot com>
Full name Dale McCoy <dalestan at gmail dot com>
Date 2011-06-27 07:02:59 PDT
Message On Mon, Jun 27, 2011 at 04:31, John Emmas <johne53 at tiscali dot co dot uk> wrote:
> Unfortunately, I've made changes to many of the affected files so I
> can't test that until I can check in the changes (not for a few days
> at least). However, I'll bear that in mind Simon.
>
> Having said that, my recollection is that it does update files in my
> local copy. It certainly produces some output which makes it look
> like that's happening - and it correctly identifies files which
> aren't under SVN control and leaves them alone.
> I'm still inclining towards the view that these files are somehow
> being detected as binary files.

Tortoise, or more likely, the svn libraries, will (IIRC) refuse to set
svn:eol-style on files that do not conform to the target setting.
Manually remove all CR characters from the offending files, and then
try setting svn:eol-style again.

Dale McCoy

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-06-27 01:31:31 PDT
Message On 27 Jun 2011, at 09:13, Simon Large wrote:

>
> I'm not sure that the line ending is changed on existing files in your
> WC. If that property is already set in the repository copy, what
> happens if you delete the local copy of the file and then update to
> force a fresh copy to be created?
>

Unfortunately, I've made changes to many of the affected files so I can't test that until I can check in the changes (not for a few days at least). However, I'll bear that in mind Simon.

Having said that, my recollection is that it does update files in my local copy. It certainly produces some output which makes it look like that's happening - and it correctly identifies files which aren't under SVN control and leaves them alone. I also remember (from about a month ago) having problems with some files that were being detected as "locked" and I needed to do a cleanup before I could get those ones to work - but they did work in the end. I'm still inclining towards the view that these files are somehow being detected as binary files.

John

Re: Line endings

Author simonlarge
Full name Simon Large
Date 2011-06-27 01:13:55 PDT
Message On 27 June 2011 06:29, John Emmas <johne53 at tiscali dot co dot uk> wrote:
> About a month ago I posted a question about line-ending styles.  Just to recap, I'm running TSVN under Windows although I'm using it with a cross-platform project that uses *nix style line endings.  I soon realised that when applying patches etc, I would often end up with Windows style line endings.  A couple of people helped me to find (and set) my preferred eol style.  And it works quite well - most of the time....
>
> Since then however, I've discovered that certain files stubbornly refuse to obey my preferred lstyle.  I'm not talking about binary files - just plain vanilla C++ header files and source files.  A high proportion of them (around 20 percent) seem to be stuck in my Windows native style (CRLF) even though they're theoretically set to my preferred style of LF (at least, that's what it says when I examine their properties).
>
> So let's say I select one or more of these files, open its TSVN Properties dialog and deliberately re-edit the eol style to CRLF.  I apply the new style then I set it back again to LF.  In both cases, TSVN goes through the motions and appears to be doing something.  But at the end of the exercise, the files are still CRLF.  Does anyone have any ideas about what could be wrong?  Is it possible that TSVN thinks they're binary files for some reason?

I'm not sure that the line ending is changed on existing files in your
WC. If that property is already set in the repository copy, what
happens if you delete the local copy of the file and then update to
force a fresh copy to be created?

Simon

--
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-06-26 22:29:41 PDT
Message About a month ago I posted a question about line-ending styles. Just to recap, I'm running TSVN under Windows although I'm using it with a cross-platform project that uses *nix style line endings. I soon realised that when applying patches etc, I would often end up with Windows style line endings. A couple of people helped me to find (and set) my preferred eol style. And it works quite well - most of the time....

Since then however, I've discovered that certain files stubbornly refuse to obey my preferred lstyle. I'm not talking about binary files - just plain vanilla C++ header files and source files. A high proportion of them (around 20 percent) seem to be stuck in my Windows native style (CRLF) even though they're theoretically set to my preferred style of LF (at least, that's what it says when I examine their properties).

So let's say I select one or more of these files, open its TSVN Properties dialog and deliberately re-edit the eol style to CRLF. I apply the new style then I set it back again to LF. In both cases, TSVN goes through the motions and appears to be doing something. But at the end of the exercise, the files are still CRLF. Does anyone have any ideas about what could be wrong? Is it possible that TSVN thinks they're binary files for some reason?

John

Re: Line endings

Author jeanmarc
Full name Jean-Marc van Leerdam
Date 2011-05-22 01:36:28 PDT
Message Hi Andy,

Op 22 mei 2011 02:03 schreef "Andy Levy" <andy dot levy at gmail dot com> het volgende:
>
> On Sat, May 21, 2011 at 17:24, Jean-Marc van Leerdam
> <j.m.van.leerdam@​gmail.com> wrote:
> >> Argh, gmail on droid forces me to top-post
> >>
> >
> > Not on all androids anymore, this was sent from a GalaxyS9000 with the
> > default GMail client. There is a button next to the checkbox to include
the
> > original text (labeled 'inline beantwoorden' in the Dutch version)
>
> Maybe you're running 2.3? Most of us in the US are still stuck on 2.2.
>
No, I am on android 2.2.1, FROYO.XWJS5, the 2.3 update has not yet arrived
in NL. I think I got the new GMail client when I updated through Kies two
weeks ago (expecting 2.3, but receiving a Froyo update instead).

Regards,
Jean-Marc
Attachments

Re: Line endings

Author levyam
Full name Andy Levy
Date 2011-05-21 17:02:53 PDT
Message On Sat, May 21, 2011 at 17:24, Jean-Marc van Leerdam
<j.m.van.leerdam@​gmail.com> wrote:
> Hi andy,
>
> Op 21 mei 2011 14:05 schreef "Andy Levy" <andy dot levy at gmail dot com> het volgende:
>
>>
>> Make sure it's "native" - all lower case.
>>
>> Argh, gmail on droid forces me to top-post
>>
>
> Not on all androids anymore, this was sent from a GalaxyS9000 with the
> default GMail client. There is a button next to the checkbox to include the
> original text (labeled 'inline beantwoorden' in the Dutch version)

Maybe you're running 2.3? Most of us in the US are still stuck on 2.2.

Re: Line endings

Author jeanmarc
Full name Jean-Marc van Leerdam
Date 2011-05-21 14:24:19 PDT
Message Hi andy,

Op 21 mei 2011 14:05 schreef "Andy Levy" <andy dot levy at gmail dot com> het volgende:
>
> Make sure it's "native" - all lower case.
>
> Argh, gmail on droid forces me to top-post
>

Not on all androids anymore, this was sent from a GalaxyS9000 with the
default GMail client. There is a button next to the checkbox to include the
original text (labeled 'inline beantwoorden' in the Dutch version)

Regards,
Jean-Marc
Attachments

Re: Line endings

Author levyam
Full name Andy Levy
Date 2011-05-21 05:05:46 PDT
Message Make sure it's "native" - all lower case.

Argh, gmail on droid forces me to top-post
On May 21, 2011 7:27 AM, "John Emmas" <johne53 at tiscali dot co dot uk> wrote:
> On 21 May 2011, at 09:09, Simon Large wrote:
>
>>
>> You need to run SVN cleanup.
>>
>
> Thanks Simon, that did the trick. Going back to my original question (line
endings) I noticed that although the default setting for eol-style is
"Native", if I actually try to set it to Native I get an error telling me
that this isn't a recognised value.
>
> John
>
> --------------------​--------------------​--------------
>
http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessageId=2​743272
>
> To unsubscribe from this discussion, e-mail: [
users-unsubscribe@to​rtoisesvn.tigris.org​].
Attachments

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-05-21 04:27:11 PDT
Message On 21 May 2011, at 09:09, Simon Large wrote:

>
> You need to run SVN cleanup.
>

Thanks Simon, that did the trick. Going back to my original question (line endings) I noticed that although the default setting for eol-style is "Native", if I actually try to set it to Native I get an error telling me that this isn't a recognised value.

John
Attachments

Re: Line endings

Author simonlarge
Full name Simon Large
Date 2011-05-21 01:09:45 PDT
Message On 21 May 2011 07:32, John Emmas <johne53 at tiscali dot co dot uk> wrote:
> On 20 May 2011, at 15:19, John Emmas wrote:
>
>>
>> 1) What does it mean when it says "Apply Property Recursively"?  I assumed that if I selected some folders along with my source files, the new eol-style would be propagated to the properties of any source files in those folders but that doesn't happen.
>>
> I figured out what the problem was.  When I include some folders in my selection, the first couple seem to work okay but it stops applying my selection from the third folder onwards.  If I open that folder and select a single file at random, when I try to change its eol-style property I get an error message telling me that my working copy is locked.  This applies to all the files in that particular folder - but not to any of the others.
>
> I'm pretty certain it shouldn't be locked.  None of the other files or folders are locked for this project.  How do I remove the locked status?

Unfortunately SVN's use of the word 'lock' is ambiguous and can refer
to working copy locks which you apply yourself to prevent others from
committing file(s) to the repository, or the OS file locking mechanism
which is used under the hood by SVN. In this case it's the latter. You
need to run SVN cleanup.

Simon

--
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-05-20 23:32:13 PDT
Message On 20 May 2011, at 15:19, John Emmas wrote:

>
> 1) What does it mean when it says "Apply Property Recursively"? I assumed that if I selected some folders along with my source files, the new eol-style would be propagated to the properties of any source files in those folders but that doesn't happen.
>
I figured out what the problem was. When I include some folders in my selection, the first couple seem to work okay but it stops applying my selection from the third folder onwards. If I open that folder and select a single file at random, when I try to change its eol-style property I get an error message telling me that my working copy is locked. This applies to all the files in that particular folder - but not to any of the others.

I'm pretty certain it shouldn't be locked. None of the other files or folders are locked for this project. How do I remove the locked status?

John

Re: Line endings

Author fsaphir
Full name Felix Saphir
Date 2011-05-20 07:56:07 PDT
Message Am 20.05.2011 16:19, schrieb John Emmas:
>
> 1) What does it mean when it says "Apply Property Recursively"? I
> assumed that if I selected some folders along with my source files,
> the new eol-style would be propagated to the properties of any source
> files in those folders but that doesn't happen. Should it?

Hmm, I just tried, and it worked for me as expected: all files had their
svn:eol-style property modified.


> 2) On 20 May 2011, at 14:17, Felix Saphir wrote:
>>
>> P.S. Please quote some context in your replies.
>
> I don't understand. What information did I miss out?

Quoting context helps others to understand what you're talking about.

Felix

Re: Line endings

Author levyam
Full name Andy Levy
Date 2011-05-20 07:54:36 PDT
Message On Fri, May 20, 2011 at 10:19, John Emmas <johne53 at tiscali dot co dot uk> wrote:
> Thanks, I found it.  A couple of things puzzled me though:-
>
> 1) What does it mean when it says "Apply Property Recursively"?  I assumed that if I selected some folders along with my source files, the new eol-style would be propagated to the properties of any source files in those folders but that doesn't happen.  Should it?
>
>
> 2) On 20 May 2011, at 14:17, Felix Saphir wrote:
>
>>
>> P.S. Please quote some context in your replies.
>>
>
> I don't understand.  What information did I miss out?

Your first reply had no content other than what you wrote. You should
be quoting the text you're replying to (as I've done here) so that
people know what you're talking about.

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-05-20 07:19:43 PDT
Message Thanks, I found it. A couple of things puzzled me though:-

1) What does it mean when it says "Apply Property Recursively"? I assumed that if I selected some folders along with my source files, the new eol-style would be propagated to the properties of any source files in those folders but that doesn't happen. Should it?


2) On 20 May 2011, at 14:17, Felix Saphir wrote:

>
> P.S. Please quote some context in your replies.
>

I don't understand. What information did I miss out?

John

Re: Line endings

Author fsaphir
Full name Felix Saphir
Date 2011-05-20 06:17:58 PDT
Message Am 20.05.2011 15:15, schrieb John Emmas:
> I know I'm just being dim but where exactly do I find the eol-style
> property? I looked through all the entries in the Settings dialog
> but I must have missed it if it's there.... :-(

It's a property you set per-file in your working copy. You can find the
dialog in the context menu.

Felix

P.S. Please quote some context in your replies.

Re: Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-05-20 06:15:43 PDT
Message I know I'm just being dim but where exactly do I find the eol-style property? I looked through all the entries in the Settings dialog but I must have missed it if it's there.... :-(

John

Re: Line endings

Author simonlarge
Full name Simon Large
Date 2011-05-20 05:22:45 PDT
Message On 20 May 2011 12:10, Nicolas Goutte <nicolas.goutte@e​xtragroup.de> wrote:
>
> Am 20.05.2011 um 13:00 schrieb John Emmas:
>
> > A few weeks ago I used TortoiseSVN to check out a project that was
> > originally written for Linux.  The source models (all 'C' and C++)
> > had *nix style line endings.  Unfortunately, TortoiseSVN converted
> > them all to Windows style (0x0D, 0x0A).  Is here any way I can
> > configure Tortoise not to do this?  I know from past experience that
> > it tends to result in problems.
>
> The property svn:eol-style is probably set to CRLF for these files.
> You can set them to "native" for example.

It may be that they already are set to native, so if you checkout on a
Windows machine it will indeed convert to CR-LF on you local machine.
But those line endings won't get committed back to the repository. If
you don't want the conversions, either remove the eol-style property
before checkout (on the linux box) or set svn:eol-style to LF.

Simon

--
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net

Re: Line endings

Author Nicolas Goutte <nicolas dot goutte at extragroup dot de>
Full name Nicolas Goutte <nicolas dot goutte at extragroup dot de>
Date 2011-05-20 04:10:54 PDT
Message Am 20.05.2011 um 13:00 schrieb John Emmas:

> A few weeks ago I used TortoiseSVN to check out a project that was
> originally written for Linux. The source models (all 'C' and C++)
> had *nix style line endings. Unfortunately, TortoiseSVN converted
> them all to Windows style (0x0D, 0x0A). Is here any way I can
> configure Tortoise not to do this? I know from past experience that
> it tends to result in problems.

The property svn:eol-style is probably set to CRLF for these files.
You can set them to "native" for example.

>
> John
>
> --------------------​--------------------​--------------
> http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessageId=2​742263
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@t​ortoisesvn.tigris.or​g
> ].

Have a nice day!

Nicolas Goutte


extragroup GmbH - Karlsruhe
Waldstr. 49
76133 Karlsruhe
Germany

Geschäftsführer: Lars Busch
Registergericht: Amtsgericht Münster / HRB: 5624
Steuer Nr.: 337/5903/0421 / UstID: DE 204607841

Line endings

Author John Emmas <johne53 at tiscali dot co dot uk>
Full name John Emmas <johne53 at tiscali dot co dot uk>
Date 2011-05-20 04:00:44 PDT
Message A few weeks ago I used TortoiseSVN to check out a project that was originally written for Linux. The source models (all 'C' and C++) had *nix style line endings. Unfortunately, TortoiseSVN converted them all to Windows style (0x0D, 0x0A). Is here any way I can configure Tortoise not to do this? I know from past experience that it tends to result in problems.

John
Messages per page: