branches/4.x/ has been created. You must "svn switch" to do bug fixes destined to Tiki4.0

[Marc Laporte-3]

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,  <marclaporte@...> 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
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>

--
Marc Laporte

http://MarcLaporte.com
http://TikiWiki.org/MarcLaporte
http://AvanTech.net
http://OurWiki.net

------------------------------------------------------------------------------
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-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

[Jonny Bradley-2]

Ok, as far as i can determine (!?) the merge back to trunk script is  
now working.

The command is:

     php doc/devtools/svnbranchupdate.php branches/4.x

I have removed all the specific directory svn:mergeinfo properties  
from all but the root dir, so hopefully the merges will be cleaner and  
easier to see and fix conflicts (i hope). If this is wrong the we can  
roll it back... (the scripts don't use this as it's an svn 1.5+  
specific feature, so i'm told)

So, let's go fix some bugs! :)

jonny



On 3 Nov 2009, at 06:06, Marc Laporte wrote:

> 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,  
> <marclaporte@...> 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
>> Tikiwiki-cvs@...
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>>
>
>
>
> --
> Marc Laporte
>
> http://MarcLaporte.com
> http://TikiWiki.org/MarcLaporte
> http://AvanTech.net
> http://OurWiki.net
>
> ------------------------------------------------------------------------------
> 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-devel mailing list
> Tikiwiki-devel@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

------------------------------------------------------------------------------
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-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

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:marc@...]
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,  <marclaporte@...> 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
> Tikiwiki-cvs@...
> 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


------------------------------------------------------------------------------
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-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

[Marc Laporte-3]

Knowledge captured here:
http://dev.tikiwiki.org/SVNTips#Notes_from_4.x_release_process

Please do improve notes so Tiki5 is smoother.

Thanks!

M ;-)


On Tue, Nov 3, 2009 at 10:51 AM, Jonny Bradley <tw@...> wrote:
>
> Ok, as far as i can determine (!?) the merge back to trunk script is
> now working.
>

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Tikiwiki-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

This should be fixed in 4.x since a few days. Pleas report if you can
reproduce.

Le mardi 03 novembre 2009 15:28:21, geoff@enmore a écrit :

> 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','f03d845e0abf31e72409cf7c5c
> 7 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:marc@...]
> 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,  <marclaporte@...> 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
> > Tikiwiki-cvs@...
> > 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
>
>
> ---------------------------------------------------------------------------
> --- 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-devel mailing list
> Tikiwiki-devel@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Tikiwiki-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

OK - doesn't seem to be a problem now - have been re-synch'ing once or twice
a day now without any re-occurrence

Thanks!

geoff

-----Original Message-----
From: Filipus Klutiero [mailto:chealer@...]
Sent: 09 November 2009 16:51
To: geoff@...; Tikiwiki developers
Subject: Re: [Tikiwiki-devel] branches/4.x/ has been created. You must
"svnswitch" to do bug fixes destined to Tiki4.0

This should be fixed in 4.x since a few days. Pleas report if you can
reproduce.

Le mardi 03 novembre 2009 15:28:21, geoff@enmore a écrit :

> 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','f03d845e0abf31e72409c
> f7c5c
> 7 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:marc@...]
> 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,  <marclaporte@...>

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
> > Tikiwiki-cvs@...
> > 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
>
>
> ----------------------------------------------------------------------
> -----
> --- 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-devel mailing list
> Tikiwiki-devel@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>
No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 8.5.425 / Virus Database: 270.14.55/2489 - Release Date: 11/08/09
19:39:00

No virus found in this outgoing message.
Checked by AVG - www.avg.com
Version: 8.5.425 / Virus Database: 270.14.55/2489 - Release Date: 11/08/09
19:39:00


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Tikiwiki-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel