[codeface] Re: [PATCH] Change line endings

  • From: Mitchell Joblin <joblin.m@xxxxxxxxx>
  • To: Wolfgang Mauerer <wolfgang.mauerer@xxxxxxxxxxxxxxxxx>
  • Date: Thu, 8 Oct 2015 13:04:27 +0200

On Wed, Oct 7, 2015 at 3:11 PM, Wolfgang Mauerer
<wolfgang.mauerer@xxxxxxxxxxxxxxxxx> wrote:

Hi Mitchell,

Am 07/10/2015 um 15:01 schrieb Mitchell Joblin:
Hi Wolfgang,

On Wed, Oct 7, 2015 at 2:35 PM, Wolfgang Mauerer
<wolfgang.mauerer@xxxxxxxxxxxxxxxxx> wrote:
When did the line endings change, actually? Are they exported
like this from mysql workbench? Might the change be caused
by the recently merged autocrlf patch? If yes, I'd prefer to fix
the line endings issue on this level.

I am not entirely sure what caused the issue, but AFAIK no changes
were made to the datamodel is quite a while so I think it is related
to the patch editing the git attributes file. Basically git would not
allow me to do anything until I commited the file with the new line
endings, even git reset --hard did not accomplish anything. This was
quick fix, if there is a better way to handle this can you please make
a detailed recommendation. I am not familiar with how to correctly
deal with this issue.

(including the autocrlf patch author)

if we fix the line endings like suggested by the patch, we will likely
run into the same issue next time we update the data model.

However, not the complete file seems to suffer from changed line
endings -- the hunks in question introduce database views that seem to
be manually written and not auto-generated. Likely, mysql workbench
does not export standard line endings for such code, but passes on what
it gets as input.

Yes, that was the issue. It was just the views that were manually
scripted and so I changes those in the model.


Could you check this in mysql workbench, and then change the code
directly there (+ submit a combined binary/ASCII change)? This way, we
would only have to do this once, not every time we change the data
model.

I have done this now. The commits are pushed.

--Mitchell


Thanks, Wolfgang

Other related posts: