From: <ge...@en...> - 2009-11-03 20:28:40
|
Hi - I've just switched my test site from trunk to the new 4.x branch so that I can focus upon 4.x testing, but when I svn up'd and re-ran install, during the upgrade step I got 30+ messages like: INSERT into `users_objectpermissions` (`groupName`, `permName`, `objectType`, `objectId`) values ('content_mgr','tiki_p_read_article','category','f03d845e0abf31e72409cf7c5c7 04a2e'); And then an SQL query failure: UPDATE `users_objectpermissions` SET `permName`=? WHERE `permName`=? Duplicate entry 'f03d845e0abf31e72409cf7c5c704a2e-category-content_mgr-tiki_p_vie' for key 1 Not sure if this was expected but thought I would report it Cheers geoff -----Original Message----- From: Marc Laporte [mailto:ma...@ma...] Sent: 03 November 2009 06:07 To: CVS/SVN commits information Cc: Tikiwiki developers Subject: [Tikiwiki-devel] branches/4.x/ has been created. You must "svnswitch" to do bug fixes destined to Tiki4.0 Hi! 1- This is the official branch for Tiki 4.x 2- From now on, all fixes should go to this new branch. You do not need to (read: should not) commit to trunk as well. 3- To help fix Tiki4, please do svn switch http://dev.tikiwiki.org/Download#switch_to_branches_4.x 4- From now on, if you commit to trunk, it's for Tiki5. (or if you backport to proposed, could later be approved to 4.1) But for now, let's keep simple and all focus on branches/4.x 5- Todo: fix script (this script is to merge all fixes on 4.x to trunk) php doc/devtools/svnbranchupdate.php branches/4.x 5a) Sylvie has volunteered to run this script regularly. Please coordinate with her to help. Thank you everyone! On Tue, Nov 3, 2009 at 12:58 AM, <mar...@us...> wrote: > Revision: 22815 > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22815&view=rev > Author: marclaporte > Date: 2009-11-03 05:58:13 +0000 (Tue, 03 Nov 2009) > > Log Message: > ----------- > [BRANCH] Creation, trunk 0 to 22810 > > Added Paths: > ----------- > branches/4.x/ > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ---------------------------------------------------------------------- > -------- Come build with us! The BlackBerry(R) Developer Conference in > SF, CA is the only developer event you need to attend this year. > Jumpstart your developing skills, take BlackBerry mobile applications > to market and stay ahead of the curve. Join us from November 9 - 12, > 2009. Register now! > http://p.sf.net/sfu/devconference > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net No virus found in this outgoing message. Checked by AVG - www.avg.com Version: 8.5.424 / Virus Database: 270.14.46/2477 - Release Date: 11/03/09 07:36:00 |