From: mose <mo...@mo...> - 2005-01-22 22:56:29
|
yo I just merged 1.8 to 1.9 and 1.9 to 1.10, that didn't occur since 3 monthes and was quite long. It may have introduced oddities and unwanted effects in 1.9 and 1.10 cvs versions, please help to check it well and to fix it if necessary. cheers, mose |
From: Sylvie G. <sgr...@co...> - 2005-04-06 11:26:12
|
Automatic merges between version are very difficult and introduce a lot of bugs. It seems it will be better we stop automatic merge. It will be now the responsability for each person to commit in a version and to backport or merge in another one. If you do so, specify backport or merge in the commit message ;-) To merge you can use the instructions specified in doc/devtools/tikimerge.php We will try this solution: it will ask everyone more job but the result will have a better quality (except if a person wants to take this job .. merging are good for karma ;-) ) sylvie |
From: Damian P. <da...@da...> - 2005-04-06 20:05:19
|
On Wed, Apr 06, 2005 at 07:23:12AM -0400, Sylvie Greverend wrote: > Automatic merges between version are very difficult and introduce a lot of > bugs. > It seems it will be better we stop automatic merge. It will be now the > responsability for each person to commit in a version and to backport or > merge in another one. If you do so, specify backport or merge in the commit > message ;-) > To merge you can use the instructions specified in > doc/devtools/tikimerge.php > We will try this solution: it will ask everyone more job but the result will > have a better quality (except if a person wants to take this job .. merging > are good for karma ;-) ) > sylvie > Sylvie, this is *very* dangerous to annouce that anyone can perform merges in files. If someone misses or does a tagging wrong, you can kiss TikiWiki CVS branches goodbye. If you want an experienced merger, just ask me. -- Damian Parker Damosoft - TikiWiki Support, Development and Training http://www.damosoft.co.uk / http://tikihost.net / http://tikiwiki.info Telephone - 0845 004 3923 IAXtel - 700-168-0333 FWD - 72453 Full Online Support Tracking at - http://support.damosoft.net |
From: mose <mo...@ti...> - 2005-04-06 20:20:53
|
le Wed, Apr 06, 2005 at 09:05:15PM +0100 par Damian Parker : > On Wed, Apr 06, 2005 at 07:23:12AM -0400, Sylvie Greverend wrote: > > Automatic merges between version are very difficult and introduce a lot of > > bugs. > > It seems it will be better we stop automatic merge. It will be now the > > responsability for each person to commit in a version and to backport or > > merge in another one. If you do so, specify backport or merge in the commit > > message ;-) > > To merge you can use the instructions specified in > > doc/devtools/tikimerge.php > > We will try this solution: it will ask everyone more job but the result will > > have a better quality (except if a person wants to take this job .. merging > > are good for karma ;-) ) > > sylvie > > > > Sylvie, this is *very* dangerous to annouce that anyone can > perform merges in files. If someone misses or does a tagging > wrong, you can kiss TikiWiki CVS branches goodbye. - anyone can perform merges for ages. Anyone that can commit can mess out cvs instantly and become a pain. It didn't happen so frequently. > > > If you want an experienced merger, just ask me. - it's good that merging techniques are known by more than a few people. Knowledge is important to spread. What is *very* dangerous is obscurity, scarcity, and fear. cheers, mose |
From: Sylvie G. <sgr...@at...> - 2005-04-07 20:22:57
|
Tikwiki 1.9 DR4 is out! You can download it from SourceForge. You can view the changelog at http://tikiwiki.org/tiki-index.php?page=ReleaseProcess19dr4 It is still a developer release. Some libraries are still GPL. There are some bugs .. but a lot are fixed. If you have a 1.9 RC3, I will encourage you to download this one . It contains a lot of security fix (some from December/January) (Don't forget to save your old database, run db/tiki_1.8to1.9.sql and clean the caches) Thanks to all the persons who contribute :-) Sylvie |
From: Gilles M. <Gil...@un...> - 2005-04-07 22:10:30
|
Sylvie Greverend a =E9crit : >Tikwiki 1.9 DR4 is out! >You can download it from SourceForge. > > > =20 > F=E9licitations ! Jean Pierre Grenouille :=3D) |
From: mose <mo...@ti...> - 2005-04-08 02:59:06
|
le Thu, Apr 07, 2005 at 04:19:55PM -0400 par Sylvie Greverend : > Tikwiki 1.9 DR4 is out! > You can download it from SourceForge. > > You can view the changelog at > http://tikiwiki.org/tiki-index.php?page=ReleaseProcess19dr4 > > It is still a developer release. > Some libraries are still GPL. There are some bugs .. but a lot are fixed. > If you have a 1.9 RC3, I will encourage you to download this one . It > contains a lot of security fix (some from December/January) (Don't forget to > save your old database, run db/tiki_1.8to1.9.sql and clean the caches) > > Thanks to all the persons who contribute :-) - good work sylvie ! :) mose |
From: Martin S. <mar...@gm...> - 2005-04-08 18:04:28
|
On Apr 7, 2005 5:19 PM, Sylvie Greverend <sgr...@at...> wrote: > Some libraries are still GPL. There are some bugs .. but a lot are fixed. The tikifest Buenos Aires is in a few weeks. We'll help you :) Btw, I have found lots of bugs related to advanced permissions (every user can view wikipages but just a few of them can view wikipages from a specific structure). The problem is that this permission check is only on tiki-index.php so you end with lists of things you can't view (in modules (last modifications, for example) and tiki-*.php files) I find it difficult to fix those problems: It's not easy to implement the permission checks at DB level and lots of problems arise when you query the db for N rows and print just M that the user has permission to see. Im not sure what do you want to do with those See you, thanks for your work ;) |