Relationship with repo on Savannah

[manphiz]

Hi,

I noticed that on the GNU Elpa page of muse the repository link is actually point to savannah[1]. However, it looks like it last release was from 2018, while there had been no activities on the Savannah repo since 2010. And then there had been a few commits on 2020 but without incorporating the old commits back in 2012-2018 from this repo, which further diverged from here. I'm wondering which is considered the canonical upstream of muse and whether there is any plan to converge? Thanks!

[1] https://git.savannah.gnu.org/cgit/emacs/elpa.git/?h=externals/muse

[manphiz]

Also noticed that from the Savannah repo muse is now an official GNU project via copyright assignment:

Copyright (C) 2004-2020 Free Software Foundation, Inc.

So do you want to collaborate with the upstream? (Like forwarding the contributed patches in this repo)

[monnier]

Indeed, the Muse package has its copyright assigned to the FSF.

The version of Muse up in elpa.git was forked from this one for historical reasons (GNU ELPA was not able to handle packages where the ELisp files were not in the root directory, and indeed it is not just GNU ELPA but the whole ELPA infrastructure which handles this case poorly ☹️ ).

I just pushed to elpa.git some changes which move the files back at their "normal" place, so as to reduce the differences between that code and the code in here (now that GNU ELPA does support this layout 🙂 ).

If you can try and include the remaining differences (mostly cleanups to try and keep the code working with newer Emacsen and fix some warnings, tho there are still many) into this repository, we should be able to unfork them.

[manphiz]

Hi @monnier, thanks for the update! I have compared the elpa version with this repo and it looks like most of recent commits are all synced, so I would consider that the elpa verison is now "up-to-date". Thanks for working on this!

[monnier]

Hi @monnier, thanks for the update! I have compared the elpa version with this repo and it looks like most of recent commits are all synced, so I would consider that the elpa verison is now "up-to-date". Thanks for working on this!

Any hope you could `git merge` (without `--squash`!) from the branch on `elpa.git` to bring in the changes we've accumulated there, so the two are truly in sync? If you do that, then GNU ELPA will from then on be able to automatically track(mirror) your upstream branch, like we do for (almost) all other packages.