Actually, I'm not sure what I'm doing - I added some things to the gitattributes file but that didn't seem to do anything so I'll stop messing about now before I break anything :-)
On 27 February 2017 at 12:39, claudio canepa <[email protected]> wrote: > Hi Richard, glad to hear from you. > >>Looking at the cocos codebase there's a mix of CRLF and LF files in > there. Before I look at resetting my clone of the repos and redoing > the above patches, I wonder whether you'd be open to normalising the > CRLF/LF mix in the repository? > > Yes, of course. > Can you do the normalization ? I'm up to the nose at work now, so I don't > think I can attempt to fix before ten days. > > > > On Sun, Feb 26, 2017 at 7:30 PM, Richard Jones <[email protected]> > wrote: >> >> Hi Claudio, >> >> I've been away from cocos/pyglet for a while now, but I've jumped back >> in over the weekend to play with some ideas I've had. Unfortunately, >> I've run into some issues in the cocos codebase and, compounded, >> they're making life a little painful. >> >> - I ran into an issue in the tiles code that's a single-line change to >> fix (improve property lookup on map cells), and also I wanted to fix >> compatibility with the current master pyglet sprites (pyglet dropped >> the _scale attribute) >> - In doing so, I merged upstream cocos from you, but ran into a >> problem that the tiles code had been transformed from CRLF line >> terminators to just LF (yay!). That meant my patch merge was tricky, >> but doable, no problem. >> - But now I'm looking to submit a PR for those changes, and another >> file has also been transformed and I'm out of sync again, so the PR is >> much broader than it should be. I'm going to reset my clone (not sure >> how, merging your upstream hasn't completely resolved everything, I >> might need to delete and re-clone). >> >> Looking at the cocos codebase there's a mix of CRLF and LF files in >> there. Before I look at resetting my clone of the repos and redoing >> the above patches, I wonder whether you'd be open to normalising the >> CRLF/LF mix in the repository? >> >> >> Richard >> >> -- >> You received this message because you are subscribed to the Google Groups >> "cocos2d discuss" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to [email protected]. >> To post to this group, send email to [email protected]. >> Visit this group at https://groups.google.com/group/cocos-discuss. >> For more options, visit https://groups.google.com/d/optout. > > > -- > You received this message because you are subscribed to the Google Groups > "cocos2d discuss" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at https://groups.google.com/group/cocos-discuss. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "cocos2d discuss" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/cocos-discuss. For more options, visit https://groups.google.com/d/optout.
