Item13168: TopicUserMappingContrib on trunk older than on Foswiki.org

Checked in is 3.4.3. Released is 3.4.7

Plugin info lists these additional tasks on f.o.: (Flagging with if master has the fix)

1. Foswikitask:Item12329: Document core change: Code that deletes stale registrations needs it's own expiration timer.
2. Foswikitask:Item11821: Don't filter user names beginning with "Web" from BulkResetPassword (Typo ... it should be Foswikitask:Item11281:
3. Foswikitask:Item11923: Better logging of changes to group membership.
4. Foswikitask:Item12003: FAQRebuildingWikiUsersTopic creates an invalid WikiUsers topic
5. Foswikitask:Item12006: Don't generate edit links for NobodyGroup
6. Foswikitask:Item11965: Correct "undefined variable" errors in mailnotify
7. Foswikitask:Item11746: Change email address instructions were incorrect
8. Foswikitask:Item11267: Convert to perl version strings.

Could be a docu miss only. Not sure though if we are missing any other substantial commit.

-- MichaelDaum - 18 Dec 2014

Yes quite a few differences. Looks like Release branch fixes were never pulled into trunk, and trunk continued to take changes as well.

cd distro/TopicUserMappingContrib && find . -type f -exec git diff master:{} Release01x01:{} \; gives a file by file diff.

I'll take the task to try to generate a "Sync-up" commit of the two versions. We can try to cherry-pick, but I suspect there will be too many conflicts for much of it.

-- GeorgeClark - 18 Dec 2014

This is ugly. The diff's show some major divergence quite early on master, including perltidies. Probably need to verify each task and fit them manually. For Foswiki/Users/TopicUserMapping.pm a cherry-pick is pretty much out.

Update... Still a lot of differences to resolve, but the important tasks above are all applied to both master and Release01x01. Last two are very broad tasks - need manual intervention. Also I think it's time to update to 3.50 on trunk instead of 3.4.7.

-- GeorgeClark - 18 Dec 2014

It appears that master branch is the right version to use. Nothing on Release01x01 appears to be missing. Updating the docs and closing this task.

-- GeorgeClark - 18 Dec 2014

Commenting is disabled while not logged in