After recent "Normalize line endings" changeset (448aef880252 Mercurial-only AFAICT) Make says file missing

7 views
Skip to first unread message

Tony Mechelynck

unread,
Jun 26, 2023, 5:56:59 AM6/26/23
to Christian Brabandt, vim_dev
At hg CSID 448aef880252 by Christian Brabandt: Problem detected at or
near src/Makefile line 1972. I believe there is a problem of some kind
with src/auto/config.mk or src/shadow/auto/config.mk. Neither plain
"make" nor "make reconfig" work. For the time being I have updated
back to previous changeset (hg CSID d110c049e688 by Bram Moolenaar)
then "make reconfig" works.

Vim had come up unexpectedly with a 3-way diff in src/feature.h on a
line with one change by me when trying to merge 448aef880252 with my
(few) own changes. What was this changeset about? What exactly did it
change in all those files? Maybe I did some false maneuver.

Best regards,
Tony.

Christian Brabandt

unread,
Jun 26, 2023, 6:10:40 AM6/26/23
to vim_dev
I am sorry if I caused this. I noticed today, that my local git worktree
showed all files as using wrong line-endings. I don't know why and I
tried fiddling with git config core.autocrlf true/false but neither
worked.

So I did git reset --hard to have a clean state but then of course hg
noticed the change in the file endings and complained. So I quickly
commited those changes there to not cause any issues when further
patches are received.

I have no idea why this happened and it was just my way to quickly fix
an issue I noticed.

Is there anything in particular I need to rollback or fix?

Best,
Christian
--
Um die Wahrheit zu erfahren, muß man den Menschen widersprechen.
-- George Bernard Shaw

Tony Mechelynck

unread,
Jun 26, 2023, 6:30:30 AM6/26/23
to vim...@googlegroups.com
I don't know. What were those "wrong line endings"? CR+LF, LF only,
something else ? If you (temporarily) go back one changeset (hg
d110c049e688, no that one has no git CSID listed, then hg
9e28090dd246 git 590aae35575cbd74d80c41d87fc647f2812aad70) are line
endings OK?

Another idea: After this massive change, can you compile Vim with no
problems from your hg repo?

If I knew exactly what these "wrong line endings" were and "to what"
they were changed I would be better armed to fix my problems the way
they should.

Best regards,
Tony.

Christian Brabandt

unread,
Jun 26, 2023, 7:14:54 AM6/26/23
to vim...@googlegroups.com
I don't know what happened. src/auto/configure had dos line endings and
therefore the shell wasn't found. I think I managed to fix the git
worktree and effectively reverted the hg commit as well. Please check

Best,
Christian
--
Drücken wir das Abbild der Ewigkeit auf unser Leben!
-- Friedrich Wilhelm Nietzsche (Also sprach Zarathustra)

Tony Mechelynck

unread,
Jun 26, 2023, 6:36:07 PM6/26/23
to Christian Brabandt, vim...@googlegroups.com
Maybe it was my fault after all. Thus time when the 3-way vimdiff came
up (with only one line different) I modified all 3 windows so they all
showed what I wanted then I exited by :xa — so no matter which one the
Mercurial merge picked it would be the "good" one.

I also fetched a few new changesets by Bram coming after your two huge
"line endings" changesets (updating to 9.0.1668). This time a simple
"make" called configure (with my preset environment variables,
different in each build-specific shadow directory and shell) then
apparently recompiled all modules, and all 5 builds proceeded to
normal end-of-job.

Best regards,
Tony.
Reply all
Reply to author
Forward
0 new messages