As discussed in latest edinburgh release meeting TWiki:Codev.EdinburghReleaseMeeting2006x03x13, now is the time to take care that everything that have been fixed since 4.0.1 is merged over to 4.0.2 as expected.

I have a attached a dump of current diff of TWikiRelease04x00 and DEVELOP branches to help in this process.

Quick list of files not in sync (not all files should be!):

test/unit/VariableTests.pm
test/unit/StoreTests.pm
test/unit/UsersTests.pm
test/tinderbox/report-test.pl
test/tinderbox/sandbox-plugin.pl
test/tinderbox/doit.pl
test/tinderbox/rebuild-deploy-test-if-new.pl
test/tinderbox/latest-svn-checkin.pl
test/tinderbox/README
pub/TWiki/TWikiJavascripts/prototype.js
pub/TWiki/CascadingStyleSheets/style.css
twikiplugins/NatSkinPlugin/lib/TWiki/Plugins/NatSkinPlugin.pm
twikiplugins/NatSkinPlugin/lib/TWiki/Plugins/NatSkinPlugin/Auth.pm
twikiplugins/NatSkinPlugin/data/TWiki/NatSkinPlugin.txt
twikiplugins/WorkflowPlugin/lib/TWiki/Plugins/WorkflowPlugin.pm
twikiplugins/PatternSkin/templates/viewtopicactionbuttons.pattern.tmpl
twikiplugins/NatSkin/data/Main/WebLinks.txt
twikiplugins/NatSkin/data/TWiki/TWikiWebLinks.txt
twikiplugins/NatSkin/data/TWiki/NatSkin.txt
twikiplugins/NatSkin/data/TWiki/WebLinks.txt
twikiplugins/NatSkin/data/TWiki/TWikiWebSideBar.txt
twikiplugins/NatSkin/templates/defaultbody.nat.tmpl
twikiplugins/LatexModePlugin/lib/TWiki/Plugins/LatexModePlugin.pm
twikiplugins/LatexModePlugin/data/TWiki/LatexModePlugin.txt
twikiplugins/LatexModePlugin/data/TWiki/LatexIntro.txt
twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/kupustart.js
twikiplugins/WysiwygPlugin/pub/TWiki/WysiwygPlugin/twikitools.js
twikiplugins/WysiwygPlugin/templates/edit.kupu.tmpl
twikiplugins/LocalTimePlugin/lib/TWiki/Plugins/LocalTimePlugin.pm
twikiplugins/LocalTimePlugin/data/TWiki/LocalTimePlugin.txt
twikiplugins/ClassicSkin/templates/view.classic.tmpl
twikiplugins/AliasPlugin/lib/TWiki/Plugins/AliasPlugin.pm
templates/search.tmpl
templates/rename.tmpl
templates/messages.tmpl
templates/oopssaveerr.tmpl
templates/changes.tmpl
templates/editform.tmpl
templates/view.plain.tmpl
templates/attachnew.tmpl
templates/searchformat.tmpl
templates/moveattachment.tmpl
templates/preview.tmpl
templates/edit.tmpl
templates/renameconfirm.tmpl
templates/twiki.tmpl
templates/rdiff.tmpl
templates/renamedelete.tmpl
templates/formtables.tmpl
templates/settings.tmpl
templates/backlinks.tmpl
templates/oopsmore.tmpl
templates/form.tmpl
templates/attachagain.tmpl
templates/renameweb.tmpl
templates/view.print.tmpl
templates/oopsattention.tmpl
templates/login.tmpl
templates/changeform.tmpl
templates/view.tmpl
templates/oopsaccessdenied.tmpl
templates/backlinksallwebs.tmpl
templates/searchbookview.tmpl
templates/oopsleaseconflict.tmpl
templates/addform.tmpl
templates/renamewebconfirm.tmpl
templates/renamewebdelete.tmpl
templates/oopschangelanguage.tmpl
templates/edittext.tmpl
templates/oopslanguagechanged.tmpl
templates/attachtables.tmpl
templates/backlinksweb.tmpl
templates/renamewebbase.tmpl
templates/attach.tmpl
templates/cssmediatypes.tmpl
templates/renamebase.tmpl
templates/edit.iejs.tmpl
templates/css.tmpl
tools/build_all_extensions.pl
tools/pkg/build_deb.sh
tools/pkg/debian/control
tools/pkg/debian/postinst
tools/pkg/debian/postrm
tools/pkg/debian/conffile
tools/pkg/debian/patches/upstream-Codev.ExtraneousLineInHttpHeader.patch
tools/pkg/debian/patches/upstream-Codev.ProxiedIncludesBrokenImplementationBug.patch
tools/pkg/debian/patches/upstream-Codev.SecurityAlertGainAdminRightWithTWikiUsersMapping.patch
tools/pkg/debian/patches/upstream-Support.TWikiWebCantBeProtected.patch
tools/pkg/debian/patches/upstream-Codev.InsecureViewWithFailedAuthentication.patch
tools/pkg/debian/patches/upstream-Codev.NoShellCharacterEscapingInFileAttachComment.patch
tools/pkg/debian/patches/upstream-Codev.AlternateWebPrefsBug.patch
tools/pkg/debian/changelog
tools/pkg/debian/docs
tools/pkg/debian/rules
tools/pkg/debian/templates
tools/pkg/debian/apache.conf
tools/pkg/debian/LocalSite.cfg
tools/pkg/debian/po/templates.pot
tools/pkg/debian/po/br.po
tools/pkg/debian/po/cs.po
tools/pkg/debian/po/pt_BR.po
tools/pkg/debian/po/fr.po
tools/pkg/debian/po/sv.po
tools/pkg/debian/po/vi.po
tools/MANIFEST
tools/build.pl
lib/TWiki.pm
lib/TWiki.cfg
lib/TWiki/Attach.pm
lib/TWiki/Upgrade/UpgradeToDakar.pm
lib/TWiki/Client.pm
lib/TWiki/User.pm
lib/TWiki/Render.pm
lib/TWiki/Meta.pm
lib/TWiki/Form.pm
lib/TWiki/Net.pm
lib/TWiki/Users/HtPasswdUser.pm
lib/TWiki/Users/Password.pm
lib/TWiki/Users/TWikiUserMapping.pm
lib/TWiki/Store.pm
lib/TWiki/Templates.pm
lib/TWiki/Sandbox.pm
lib/TWiki/Users.pm
lib/TWiki/UI/Register.pm
lib/TWiki/UI/Upload.pm
lib/TWiki/UI/Edit.pm
lib/TWiki/UI/Search.pm
lib/TWiki/UI/Manage.pm
lib/TWiki/UI/ChangeForm.pm
lib/TWiki/UI/RDiff.pm
lib/TWiki/UI/Statistics.pm
lib/TWiki/UI/Oops.pm
bin/setlib.cfg
bin/configure
bin/.htaccess.txt
bin/update-develop-links
data/Main/UserViewTemplate.txt
data/Main/TWikiUsers.txt
data/Main/TWikiGuest.txt
data/TWiki/ResetPassword.txt
data/TWiki/TWikiTemplates.txt
data/TWiki/ChangePassword.txt
data/TWiki/TWikiRegistration.txt
data/TWiki/NewUserTemplate.txt
data/TWiki/ManagingUsers.txt
data/TWiki/AdminSkillsAssumptions.txt
data/TWiki/CascadingStyleSheets.txt
data/TWiki/TWikiReleaseNotes04x00x00.txt
data/TWiki/TWikiUserAuthentication.txt
data/TWiki/TWikiScripts.txt
data/TWiki/TWikiVariablesQuickStart.txt
data/Sandbox/WebPreferences.txt
index.html
pseudo-install.pl
mklinks.sh 

svn blame + svn log can assist in tracking the original item numbers of eventual patches that still needs to be merged (if you find code or doc that needs to be merged).

As this is not a bug in itself, I'll just keep it on Urgent for a day (to catch attention of potentially interested parties), then close it.

-- SP

Point-in-time diff waved, discarding.

-- SP