I just wanted to edit a minor typo in the recently updated beamer.lyx French example file.
After git pull, I loaded the file with lyx-2.2.2dev (recently up to date),
make one change ('la' instead of 'le') and saved the file.

Below is the result of git diff, I'm puzzled because other changes appeared:
 * change of \origin (not uncommon, how can I avoid it?)
 * addition of \use microtype false
 * change of format, seemingly the current format of lyx-2.3
Of course, with this change I can't load the file anymore with lyx-2.2.2dev

In fact, I made this once before (through to commit), but as there were already more changes in the file, I removed the edited file with
git reset HEAD^
git checkout -- lib/examples/fr/beamer.lyx
to get back to a clean git status.
Could this come from these previous operations?
I really don't understand how there can be interactions between branch and master here, I keep two separate couple of directories, branch/buildbranch and master/buildmaster in lyx development dir.


$ git diff
diff --git a/lib/examples/fr/beamer.lyx b/lib/examples/fr/beamer.lyx
index d23bc2d..cc82a3a 100644
--- a/lib/examples/fr/beamer.lyx
+++ b/lib/examples/fr/beamer.lyx
@@ -1,9 +1,9 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 511
 \save_transient_properties true
-\origin /systemlyxdir/examples/fr/
+\origin unavailable
 \textclass beamer
 % We use the "Berkeley" theme with a 3.45em-wide side bar on the left
@@ -25,6 +25,7 @@
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format pdf2
 \output_sync 0
@@ -2726,7 +2727,7 @@ status collapsed

 \begin_layout Plain Layout

-%Pour illustrer le diff
+%Pour illustrer la diff
 '{e}rence entre d

Reply via email to