Re: master 22bee93d92: Update error message to reflect variable rename

Re: master 22bee93d92: Update error message to reflect variable rename

[Stefan Kangas]

> branch: master
> commit 22bee93d92567a1b01ebf7354089e6695e134611
> Author: Jeff Walsh <fejfighter@gmail.com>
> Commit: Stefan Monnier <monnier@iro.umontreal.ca>
>
>     Update error message to reflect variable rename
>
>     * src/comp.c (Fcomp_el_to_eln_filename): Update error message.  (Bug#55861)
>
>     [ According to the Git metadata, this commit 8436e0bee9cf7a was already
>       merged from `emacs-28`, yet the code says it was not.  :-(  ]

It was automatically skipped, but I don't understand why.

Here are the relevant commits:

commit 355d2863125e0aaf86aa7482cd050368c73b5c5e
Merge: 9c27c7f7ce 8436e0bee9
Author: Stefan Kangas <stefan@marxist.se>
Date:   Sat Jun 11 06:30:30 2022 +0200

    ; Merge from origin/emacs-28

    The following commit was skipped:

    8436e0bee9 Update error message to reflect variable rename

commit 0ad8cd40ce74c354d6a81ba08e4c694c01baa00e
Merge: 8436e0bee9 22a832ad82
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Jun 10 10:04:28 2022 +0300

    Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28

commit 8436e0bee9cf7aa8162036a1d00b385c850069ae
Author: Jeff Walsh <fejfighter@gmail.com>
Date:   Thu Jun 9 10:02:01 2022 +1000

    Update error message to reflect variable rename

    * src/comp.c (Fcomp_el_to_eln_filename): Update error message.  (Bug#55861)

Re: master 22bee93d92: Update error message to reflect variable rename

[Stefan Monnier]

> It was automatically skipped, but I don't understand why.

I don't know either.  Maybe we should be more verbose in the commit
message and include some info about what the decision was based on
(e.g. whether it was a cherrypick mark or include the text that matched
the skip-regexp)?


        Stefan

Re: master 22bee93d92: Update error message to reflect variable rename

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sat, 03 Sep 2022 14:04:07 -0400
> 
> > It was automatically skipped, but I don't understand why.
> 
> I don't know either.

I think it's because of the below (in which case I think it's a bug in
gitmerge.el).  Ironically, I did that because I wanted to prevent
merge conflicts.

I think the lesson here is that we should more closely eyeball the
commits gitmerge says it will skip.

commit d18e60fef172cf38b92108144f54ed10ddf67488
Author:     Eli Zaretskii <eliz@gnu.org>
AuthorDate: Thu Jun 9 09:56:59 2022 +0300
Commit:     Eli Zaretskii <eliz@gnu.org>
CommitDate: Thu Jun 9 09:56:59 2022 +0300

    Revert "* src/comp.c (Fcomp_el_to_eln_filename): Update error message."
    
    This reverts commit ec987e3e1786d06ffd306e5717b4d7fd118f05ac.
    This change was installed on the emacs-28 branch instead.

diff --git a/src/comp.c b/src/comp.c
index 05d9fed..97bc6a5 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4466,7 +4466,7 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename,
 	}
       if (NILP (base_dir))
 	error ("Cannot find suitable directory for output in "
-	       "`native-comp-eln-load-path'.");
+	       "`comp-native-load-path'.");
     }
 
   if (!file_name_absolute_p (SSDATA (base_dir)))