On Wed, 10 Feb 2021 at 16:56, Dima Pasechnik <dimp...@gmail.com> wrote: > > On Wed, Feb 10, 2021 at 2:58 PM John Cremona <john.crem...@gmail.com> wrote: > > > > Has anyone else been seeing the following problem, which has been > > plaguing me for a week or two. Here's a simple example. All > > computers mentioned here are running ubuntu. On a machine I had not > > used for a while I had a sage build of the develop branch at an old > > version (pre 9.0). There were no modified files (git status showed > > nothing). Then I did "git pull trac develop", after which one file is > > marked as having changed: > > > > modified: src/sage/misc/element_with_label.py > > > > It is always this file, on several machines where I have gone through > > similar steps. file shows this: > > src/sage/misc/element_with_label.py: Python script, ASCII text > > executable, with CRLF line terminators > > does > > git config core.autolf > > show 'true'?
No. > > Set it to false, IMHO this should fix this issue. It is not set at all. I saw that option after googling for help, but the issue it exists to solve is not one which has ever hit me (in sage anyway, of course I know about using dos2unix sometimes when a windows users sends a file). So, I did not change anything (as far as I can tell -- except get older) but my git state changed. These files stay changed even after trying to reset them (though *I* did not change them) using git checkout --. John > > > > > > git diff shows this: > > > > $ git diff -w src/sage/misc/element_with_label.py > > warning: CRLF will be replaced by LF in src/sage/misc/element_with_label.py. > > The file will have its original line endings in your working directory. > > > > I cannot get this to go away. git stash does nothing, and I cannot > > change branches since git thinks there is an uncommitted change. I > > have been reduced to deleting the entire build and starting again from > > scratch. > > > > No, I have not knowingly changed any configuration on these computers, > > though I have done some normal package upgrades using apt. > > > > I just went through the same steps in another directory on the same > > machine where I had an old build (8.7) and after "git pull trac > > develop" there are now 5 modified files: > > > > modified: > > build/pkgs/sage_sws2rst/src/test/Adding_Pictures_and_screenshots.sws > > modified: src/doc/en/reference/combinat/media/k-rim.JPG > > modified: src/sage/ext_data/doctest/rich_output/example.png > > modified: src/sage/ext_data/notebook-ipython/logo-64x64.png > > modified: src/sage/misc/element_with_label.py > > > > -- the same one as before and 3 others which are not even normal text > > files. I don't want to trash all these since I am trying to resurrect > > and complete work done on some old trac tickets. > > > > John > > > > -- > > You received this message because you are subscribed to the Google Groups > > "sage-devel" group. > > To unsubscribe from this group and stop receiving emails from it, send an > > email to sage-devel+unsubscr...@googlegroups.com. > > To view this discussion on the web visit > > https://groups.google.com/d/msgid/sage-devel/CAD0p0K7KrVUvvkmqt6Nwhe1Tt9ef_w3ZWAqU5GK6Y6%3Dysqq3Uw%40mail.gmail.com. > > -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sage-devel+unsubscr...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sage-devel/CAAWYfq10WrFPb-2wQfLVyhSSRRGdWr_eEQ7gyanQ9Pbgm6o6qQ%40mail.gmail.com. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/CAD0p0K41axYDsedDj4-Dc7TkANM7T3CmVyMmS%3DDHhEXQQZqn4A%40mail.gmail.com.
