Le 12/02/2024 à 21:39, Pavel Sanda a écrit :
On Mon, Feb 12, 2024 at 04:56:40PM +0100, Jean-Pierre Chrétien wrote:
which means :
I prefer english messages in verbatin so I can google them :)
Anyway, what "git status" returns?
Intro.lyx is currently modified.
<cite>
$git st
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: lib/doc/fr/Intro.lyx
</cite>
When I run git add lib/doc/fr/Intro.lyx
<cite>
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: lib/doc/fr/Intro.lyx
</cite>
Then I run 'git commit' and 'git pv' to rebase before push, and here is your
warning in English :
<cite>
Warning: File deleted from disk
----------------------------------------
The file
/ext/lyx/master/lib/doc/fr/Intro.lyx
has been deleted from disk!
Rebasing (1/2)
Rebasing (2/2)
Warning: File deleted from disk
----------------------------------------
The file
/ext/lyx/master/lib/doc/fr/Intro.lyx
has been deleted from disk!
Successfully rebased and updated refs/heads/master.
</cite>
Then
ls -l lib/doc/fr/Intro.lyx
-rw-r--r-- 1 jp jp 58800 Feb 13 16:44 lib/doc/fr/Intro.lyx
I had left Intro.lyx open in the LyX window, and I get a popup window with the
same warning about the deleted file (attached screenshot 1) and the file has
changed status from saved to modified with a warning (attached screnshot 2).
If I save the file as IntroSave.lyx, there is no difference :
$ diff lib/doc/fr/Intro.lyx lib/doc/fr/IntroSave.lyx
$
So the incorrect warning message is reproducible, and I do not see what I am
doing wrong.
--
Jean-Pierre
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
