Re: Message when I run git pull with a pending commit
On Tue, Feb 13, 2024 at 05:05:03PM +0100, Jean-Pierre Chrétien wrote: > Then I run 'git commit' and 'git pv' to rebase before push, and here is your > warning in English : > Do I get correctly that you run LyX session and git commands from the same terminal? It looks as if this part is comming from the LyX program: > Warning: File deleted from disk > > The file > /ext/lyx/master/lib/doc/fr/Intro.lyx > has been deleted from disk! And this part from git: > Rebasing (1/2) > Rebasing (2/2) > Successfully rebased and updated refs/heads/master. If true, than the "delete" warning part is just innocent. Git is doing some manipulation behind the scenes, lyx detects it and shouts that file was manipulated (deleted for a moment). The git messages are just fine then... Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
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. $git st Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: lib/doc/fr/Intro.lyx When I run git add lib/doc/fr/Intro.lyx Changes to be committed: (use "git restore --staged ..." to unstage) modified: lib/doc/fr/Intro.lyx Then I run 'git commit' and 'git pv' to rebase before push, and here is your warning in English : 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. 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
Re: Message when I run git pull with a pending commit
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? Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Refrerences to trac in the documentation (was: Message when I run git pull with a pending commit)
On Mon, Feb 12, 2024 at 05:01:32PM +0100, Jean-Pierre Chrétien wrote: > >>>BTW, I will update the reference of the documentation in trac with > >>>https://git.lyx.org/gitweb/?p=lyx.git;a=tree;f=lib/doc;hb=HEAD > >> > >>Where exactly in the trac do you want to make that change? > > > >Here : > > > > > >3.2.2 Joining the Documentation Team. > > > >The LyX Documentation Project, like anything else in the LyX project, can > >always use assistance! If you're interested in contributing to the > >Documentation Project, you need to do the following: > > > >1. Get the latest LyX source code from > >[https://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master ] > > > > > > > >Trac is longer recommended to browse lyxgit, right ? I see, you mean in documentation not in trac. It's not that simple, we are currently working on transition of trac itself so in medium term this link might be working again. Or not ;) In any case I would not change the documentation yet. Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Refrerences to trac in the documentation (was: Message when I run git pull with a pending commit)
Here I change the subject for what concerns th change from trac to git.lyx.org. Sorry if it is not the correct procedure. Would it be better located in lyx-docs ? I understood that cross-posting is not a good practice. Le 12/02/2024 à 16:45, Jean-Pierre Chrétien a écrit : BTW, I will update the reference of the documentation in trac with https://git.lyx.org/gitweb/?p=lyx.git;a=tree;f=lib/doc;hb=HEAD Where exactly in the trac do you want to make that change? Here : 3.2.2 Joining the Documentation Team. The LyX Documentation Project, like anything else in the LyX project, can always use assistance! If you're interested in contributing to the Documentation Project, you need to do the following: 1. Get the latest LyX source code from [https://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master ] Trac is longer recommended to browse lyxgit, right ? -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 13:31, Pavel Sanda a écrit : Isn't it possible that you just had 2 lyx windows opened on the same file? Or commited changes from different computer? No, none of these possibilities. I run all lyx-related stuff from my Debian bookworm box. Here is the message in French : $ git pv remote: Énumération des objets: 31, fait. remote: Décompte des objets: 100% (31/31), fait. remote: Compression des objets: 100% (19/19), fait. remote: Total 19 (delta 15), réutilisés 0 (delta 0), réutilisés du pack 0 Dépaquetage des objets: 100% (19/19), 311.03 Kio | 709.00 Kio/s, fait. Depuis git.lyx.org:lyx 8a32c34c5f..db897c1f4a master -> origin/master = [à jour]1.1.5fix_x -> origin/1.1.5fix_x = [à jour]1.1.6fix_x -> origin/1.1.6fix_x = [à jour]1.2.x -> origin/1.2.x = [à jour]1.3.x -> origin/1.3.x = [à jour]1.4.x -> origin/1.4.x = [à jour]1.5.x -> origin/1.5.x = [à jour]1.6.x -> origin/1.6.x = [à jour]2.0.x -> origin/2.0.x = [à jour]2.1.x -> origin/2.1.x = [à jour]2.2.1-staging -> origin/2.2.1-staging = [à jour]2.2.2-staging -> origin/2.2.2-staging = [à jour]2.2.3-staging -> origin/2.2.3-staging = [à jour]2.2.x -> origin/2.2.x = [à jour]2.3.0-alpha1-x -> origin/2.3.0-alpha1-x = [à jour]2.3.1-1-> origin/2.3.1-1 = [à jour]2.3.1-staging -> origin/2.3.1-staging = [à jour]2.3.2-1-> origin/2.3.2-1 = [à jour]2.3.2-2-> origin/2.3.2-2 = [à jour]2.3.2-staging -> origin/2.3.2-staging = [à jour]2.3.4-2-> origin/2.3.4-2 = [à jour]2.3.4-3-> origin/2.3.4-3 = [à jour]2.3.4-4-> origin/2.3.4-4 = [à jour]2.3.5.2-> origin/2.3.5.2 = [à jour]2.3.6.1-> origin/2.3.6.1 = [à jour]2.3.6.2-> origin/2.3.6.2 29f2a7ed66..f45c3e032a 2.3.x -> origin/2.3.x = [à jour]bugs/13017 -> origin/bugs/13017 * [nouvelle étiquette]2.4.0-RC3 -> 2.4.0-RC3 Changements de 8a32c34c5f8e296bcb40bb81c861c31b8367427c sur db897c1f4ab95290ea611bcd98eb5da387b6dcfb : po/de.gmo | Bin 653300 -> 653451 bytes po/sk.gmo | Bin 636496 -> 636629 bytes po/uk.gmo | Bin 816896 -> 816902 bytes po/uk.po | 65 + 4 files changed, 41 insertions(+), 24 deletions(-) Warning: Fichier effacé sur le disque Le fichier /ext/lyx/master/lib/doc/Customization.lyx a été effacé sur le disque ! Rebasage (1/1) Rebasage et mise à jour de refs/heads/master avec succès. which means : File /ext/lyx/master/lib/doc/Customization.lyx has been erased on disk! Rebase (1/1) Rebase and update of refs/heads/master successful. Then : $ ls /ext/lyx/master/lib/doc/Customization.lyx /ext/lyx/master/lib/doc/Customization.lyx and $ git push Énumération des objets: 9, fait. Décompte des objets: 100% (9/9), fait. Compression par delta en utilisant jusqu'à 6 fils d'exécution Compression des objets: 100% (5/5), fait. Écriture des objets: 100% (5/5), 475 octets | 475.00 Kio/s, fait. Total 5 (delta 4), réutilisés 0 (delta 0), réutilisés du pack 0 To git.lyx.org:lyx db897c1f4a..085fe133db master -> master I have this in gitconfig : [pull] rebase = true [alias] pv = pull -v -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 13:37, Pavel Sanda a écrit : On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. This message is coming from git, right? I see possibility that you committed the file, resaved the .lyx file within lyx and then got this message while workign with git. LyX is internally saving to a new file and moves away the old one, so if git is tracking the file handle instead of content (though I find this would be strange) it would explain the message. I will answer to this later. BTW, I will update the reference of the documentation in trac with https://git.lyx.org/gitweb/?p=lyx.git;a=tree;f=lib/doc;hb=HEAD Where exactly in the trac do you want to make that change? Here : 3.2.2 Joining the Documentation Team. The LyX Documentation Project, like anything else in the LyX project, can always use assistance! If you're interested in contributing to the Documentation Project, you need to do the following: 1. Get the latest LyX source code from [https://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master ] Trac is longer recommended to browse lyxgit, right ? -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
> >>>On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: > Since the update of the git server (thanks a lot, Pavel!), I get a message > telling me that the file pending to be committed has been erased on my > disk. > Happily this is not true, but a bit disturbing. This message is coming from git, right? I see possibility that you committed the file, resaved the .lyx file within lyx and then got this message while workign with git. LyX is internally saving to a new file and moves away the old one, so if git is tracking the file handle instead of content (though I find this would be strange) it would explain the message. >BTW, I will update the reference of the documentation in trac with >https://git.lyx.org/gitweb/?p=lyx.git;a=tree;f=lib/doc;hb=HEAD Where exactly in the trac do you want to make that change? Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
On Mon, Feb 12, 2024 at 11:12:28AM +0100, Jean-Pierre Chrétien wrote: > Le 12/02/2024 ?? 11:02, Jean-Pierre Chrétien a écrit : > >Dear developers > > > >Since the update of the git server (thanks a lot, Pavel!), I get a message > >telling me that the file pending to be committed has been erased on my > >disk. > >Happily this is not true, but a bit disturbing. > > As I had the file sill open in LyX, I see that it's status has been changed > to "modified" and I get the same message in a child window. > > If I reload the file, all is OK once I agree to replace the loaded file by > the one on disk. Isn't it possible that you just had 2 lyx windows opened on the same file? Or commited changes from different computer? Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 11:21, Jean-Pierre Chrétien a écrit : Le 12/02/2024 à 11:13, Jean-Pierre Chrétien a écrit : Le 12/02/2024 à 11:11, Pavel Sanda a écrit : On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. Disturbing indeed. Can you send me the exact error message, possibly in english? OK, I will retry a commit with my locale on C. Alas, no message when I committed a small change in French Intro.lyx, but there were no updates of the local tree with git pull, so I will wait to have some before retrying. I tried to use the chage I made to French Intro.lyx, but of course it did not work as the remote and local file are identical. I have to wait commits from other developers, I keep you posted. BTW, I will update the reference of the documentation in trac with : https://git.lyx.org/gitweb/?p=lyx.git;a=tree;f=lib/doc;hb=HEAD Is that correct ? -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 11:13, Jean-Pierre Chrétien a écrit : Le 12/02/2024 à 11:11, Pavel Sanda a écrit : On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. Disturbing indeed. Can you send me the exact error message, possibly in english? OK, I will retry a commit with my locale on C. Alas, no message when I committed a small change in French Intro.lyx, but there were no updates of the local tree with git pull, so I will wait to have some before retrying. -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 11:11, Pavel Sanda a écrit : On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. Disturbing indeed. Can you send me the exact error message, possibly in english? OK, I will retry a commit with my locale on C. -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
Le 12/02/2024 à 11:02, Jean-Pierre Chrétien a écrit : Dear developers Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. As I had the file sill open in LyX, I see that it's status has been changed to "modified" and I get the same message in a child window. If I reload the file, all is OK once I agree to replace the loaded file by the one on disk. -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Message when I run git pull with a pending commit
On Mon, Feb 12, 2024 at 11:02:07AM +0100, Jean-Pierre Chrétien wrote: > Since the update of the git server (thanks a lot, Pavel!), I get a message > telling me that the file pending to be committed has been erased on my disk. > Happily this is not true, but a bit disturbing. Disturbing indeed. Can you send me the exact error message, possibly in english? Pavel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Message when I run git pull with a pending commit
Dear developers Since the update of the git server (thanks a lot, Pavel!), I get a message telling me that the file pending to be committed has been erased on my disk. Happily this is not true, but a bit disturbing. Do you see this ? -- Jean-Pierre -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
