Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

2018-04-12 7:51 GMT+02:00 Ben Coman : > > > On 12 April 2018 at 12:39, Thierry Goubier > wrote: >> >> Le 12/04/2018 à 03:54, Ben Coman a écrit : >>> >>> >>> I was thinking that a smalltalk-implemented merge algorithm would only be >>> used for the

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

On 12 April 2018 at 12:39, Thierry Goubier wrote: > Le 12/04/2018 à 03:54, Ben Coman a écrit : > >> >> I was thinking that a smalltalk-implemented merge algorithm would only be >> used for the Smalltal/Tonel code, >> not for any other files. And maybe, when a merge is

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Le 12/04/2018 à 03:54, Ben Coman a écrit : I was thinking that a smalltalk-implemented merge algorithm would only be used for the Smalltal/Tonel code, not for any other files.  And maybe, when a merge is invoked from Iceberg, the callback to the merge-driver might present conflicts in a

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

On 12 April 2018 at 01:47, Thierry Goubier wrote: > Hi Ben, > > Le 11/04/2018 à 16:37, Ben Coman a écrit : > >> >> >> On 11 April 2018 at 05:05, Esteban Lorenzano > > wrote: >> >> Hi, >> >> I’ve been wondering

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Hi Ben, Le 11/04/2018 à 16:37, Ben Coman a écrit : On 11 April 2018 at 05:05, Esteban Lorenzano > wrote: Hi, I’ve been wondering how to better fix the problem of having windows and linux/macOS people contributing and the fact

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

On 11 April 2018 at 05:05, Esteban Lorenzano wrote: > Hi, > > I’ve been wondering how to better fix the problem of having windows and > linux/macOS people contributing and the fact that files are written in > their native system format (crlf windows, lf for the rest of the

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

> or a .iceberg file? Why not use `.properties`? { #format : #tonel, #eol: #lf } On Tue, Apr 10, 2018 at 11:55 PM, Esteban Lorenzano wrote: > or a .iceberg file? > > Esteban > > ps: yep, we need it… we will have it, why not start now? > > On 10 Apr 2018, at 23:52,

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Both, the checkbox will be used to set the property in disk at some point :). On Tue, Apr 10, 2018 at 11:55 PM, Esteban Lorenzano wrote: > or a .iceberg file? > > Esteban > > ps: yep, we need it… we will have it, why not start now? > > On 10 Apr 2018, at 23:52, Guillermo

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

or a .iceberg file? Esteban ps: yep, we need it… we will have it, why not start now? > On 10 Apr 2018, at 23:52, Guillermo Polito wrote: > > It could be a checkbox in the "create repository dialog". > > "Use lf as default line ending" > > (and set it to true by

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

> On 10 Apr 2018, at 23:47, Nicolai Hess wrote: > > How about > > git config --system core.autocrlf input > > I use this in my opensmalltalk-vm git repository. (I think I saw this option > in the appveyor windows-vm build) that may work too. but… I would like to

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

It could be a checkbox in the "create repository dialog". "Use lf as default line ending" (and set it to true by default (?)) On Tue, Apr 10, 2018 at 11:50 PM, Peter Uhnák wrote: > An argument can be made that Pharo would _always_ produce LF. > I don't think I've ever

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

An argument can be made that Pharo would _always_ produce LF. I don't think I've ever needed _code_ to be CRLF in a ~decade of using git on Windows. It was always just an annoyance. Peter On Tue, Apr 10, 2018 at 11:44 PM, Esteban Lorenzano wrote: > hi, > > > On 10 Apr

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

I'd say yes? https://github.com/libgit2/libgit2/commit/b83fd07880307106deb0ac7cb0d415d85c27f465 ? On Tue, Apr 10, 2018 at 11:42 PM, Guillermo Polito < guillermopol...@gmail.com> wrote: > Yes, that is the thing. Is libgit reading that properties file or not? > I'll do some digging.. > > On Tue,

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

How about git config --system core.autocrlf input I use this in my opensmalltalk-vm git repository. (I think I saw this option in the appveyor windows-vm build) 2018-04-10 23:44 GMT+02:00 Esteban Lorenzano : > hi, > > > On 10 Apr 2018, at 23:17, Esteban A. Maringolo

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

hi, > On 10 Apr 2018, at 23:17, Esteban A. Maringolo wrote: > > Not stricly related, or maybe yes, but years ago in InfOil we started > using Dolphin Smalltalk PAX format[1] for packages with Git, and we used > that setting to store code in the repo, we didn't have any

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Yes, that is the thing. Is libgit reading that properties file or not? I'll do some digging.. On Tue, Apr 10, 2018 at 11:31 PM, Peter Uhnák wrote: > > Git for Windows even asks you if you want to automatically convert CRLF > > to LF during checkin and back to CRLF on

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

> Git for Windows even asks you if you want to automatically convert CRLF > to LF during checkin and back to CRLF on checkout. There are config options `core.eol` and `core.autocrlf`, but my impression was that Iceberg was somehow bypassing them? Peter On Tue, Apr 10, 2018 at 11:17 PM, Esteban

Re: [Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Not stricly related, or maybe yes, but years ago in InfOil we started using Dolphin Smalltalk PAX format[1] for packages with Git, and we used that setting to store code in the repo, we didn't have any issues The .gitattributes contained this: *.img binary *.chg binary *.sml binary OurImage.img

[Pharo-dev] help wanted: normalising LF on tonel for Pharo project

Hi, I’ve been wondering how to better fix the problem of having windows and linux/macOS people contributing and the fact that files are written in their native system format (crlf windows, lf for the rest of the world). I digged a bit and I found a couple a link that helped me (after trying