On Mo, 26 Jun 2023, Tony Mechelynck wrote:
> 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.
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
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/ZJlkGkht/4OL/36J%40256bit.org.
