The 5.1 branch is in odd shape. It's the result of the module first being forked/completely overwritten and then - only partially - restored. Specifically:

(a) the previous plugins directory is gone
(b) there is a new themes directory left over from the fork but no longer used in this version
(c) the README and CHANGELOG files are incorrect (they're for the forked version)
(d) the translations are gone
(e) there is a superfluous LICENSE file

Our best way forward is to replace this branch with what's in HEAD. Any issues or objections? If not, I'll go ahead and do this. (Only I'm not sure if the drupal.org CVS will allow us to remove files from a branch that has a release.)

Comments

luti’s picture

luti commented

I see the naming system permits more space. Why not name a new development version 5.x-2.x-dev so there remains something in case there would be too many issues with a much different version? Or, why so complicated naming system at all, if x is practically not used (redundant)?

kreynen’s picture

kreynen commented

Anything that gets the HEAD and 5.1 release in sync before we start (re)adding features to 5.2 is fine by me. With the exception of the issues I already identified, INSTALL.txt/README.txt errors swimswimswim pointed out, and the issues Nedjo lists here, 4.7 and 5.1 release are working well with current release of Drupal and TinyMCE. Whatever makes it easier to correct these issues in 5.1 without sliding back into into issue hell, make it so.

Thank you. Thank you. Thank you, Nedjo.

nedjo’s picture

nedjo
he/him/his
Primary language English
commented

I've synched what I could. The following files are now the same in the DRUPAL-5 branch and HEAD:

INSTALL.txt
LICENSE.txt
plugin_reg.php
README.TXT
tinymce.info
tinymce.install
tinymce.module

I removed the LICENSE.txt file. I left the /themes directory and its files for now as I don't know if they exist elsewhere and they may be handy when we add back manual configurations. I tried to add in the deleted plugins directory, but got the message that the files already existed with the DRUPAL-5 tag. I imagine they were tagged and then deleted. Figuring out how to get them back into the branch is beyond my limited CVS skills.

But we're mostly back on track and can return to the standard module maintanance practice:

Apply all first changes to HEAD.
Then (since HEAD is still 5.x compatible) merge them into the 5.x branch.
Then adapt the changes for 4.7 if appropriate.

kreynen’s picture

kreynen commented
Status: Active » Closed (fixed)