| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |
| Who | What | When |
|---|---|---|
| *** | SEWilco2 has left | [00:09] |
| ..................... (idle for 1h44mn) | ||
| SEWilco2 has joined #tikiwiki
chealer has quit IRC (Remote closed the connection) | [01:53] | |
| ..... (idle for 24mn) | ||
| pascalstjean has quit IRC ("ChatZilla 0.9.85 [Firefox 3.5.3/20090824101458]")
atlan_ has joined #tikiwiki | [02:17] | |
| luminoso has quit IRC (Read error: 104 (Connection reset by peer))
luminoso has joined #tikiwiki atlan has quit IRC (Read error: 110 (Connection timed out)) luminoso has quit IRC (Read error: 104 (Connection reset by peer)) luminoso has joined #tikiwiki | [02:34] | |
| luminoso has quit IRC (Read error: 104 (Connection reset by peer))
luminoso has joined #tikiwiki luminoso_ has joined #tikiwiki luminoso has quit IRC (Connection reset by peer) luminoso_ has quit IRC (Read error: 104 (Connection reset by peer)) luminoso_ has joined #tikiwiki | [02:50] | |
| Tikiwiki|bot | New Forum Posts: Creating centered or aligned lists - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=35005 | [03:02] |
| *** | chip__ has joined #tikiwiki | [03:09] |
| .... (idle for 16mn) | ||
| atlan_ has quit IRC (Read error: 110 (Connection timed out)) | [03:25] | |
| luminoso_ has quit IRC (Read error: 104 (Connection reset by peer))
luminoso_ has joined #tikiwiki | [03:38] | |
| btiffin has joined #tikiwiki | [03:46] | |
| luminoso_ has quit IRC (Read error: 104 (Connection reset by peer)) | [03:51] | |
| luminoso has joined #tikiwiki | [03:56] | |
| ....... (idle for 32mn) | ||
| Caarrie is now known as Caarrie|sleeping | [04:28] | |
| .... (idle for 15mn) | ||
| CIA-56 | tikiwiki: 03pkdille * r22629 10/trunk/ (4 files in 3 dirs): [MOD] lesser magic deployment to blog admin template. Btw, recovering a pref (feature_blog_mandatory_category) which was lost in r17625. Will be backported to proposed
tikiwiki: 03pkdille * r22630 10/branches/proposed/templates/tiki-admin-include-blogs.tpl: [partial bp/r22629][FIX]admin blogs: Recovering a pref (feature_blog_mandatory_category) which was lost in r17625 | [04:43] |
| .............. (idle for 1h8mn) | ||
| *** | pkdille has joined #tikiwiki | [05:54] |
| ...... (idle for 27mn) | ||
| btiffin has quit IRC (Remote closed the connection) | [06:21] | |
| ....... (idle for 32mn) | ||
| Tikiwiki|bot | New Forum Posts: Something like ATTACH that uses file galleries - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=35006 | [06:53] |
| ............. (idle for 1h0mn) | ||
| *** | PrezKennedy has quit IRC (Read error: 131 (Connection reset by peer))
PrezKennedy has joined #tikiwiki | [07:53] |
| .............. (idle for 1h7mn) | ||
| FrankP_german has joined #tikiwiki | [09:00] | |
| ................. (idle for 1h22mn) | ||
| gezza has joined #tikiwiki | [10:22] | |
| Tikiwiki|bot has quit IRC (Read error: 104 (Connection reset by peer)) | [10:36] | |
| CIA-56 | tikiwiki: 03sylvieg * r22631 10/trunk/templates/ (18 files): [FIX]smarty: inclose with double quotes incase the translation has a quote | [10:46] |
| *** | Tikiwiki|bot has joined #tikiwiki
nelek has joined #tikiwiki | [10:47] |
| nelek | hello
how can i add a google ad block a module block? i tried creating a user module and put the javascript code in but it just showed empty | [10:52] |
| ..... (idle for 21mn) | ||
| *** | Caarrie|sleeping has quit IRC (Read error: 104 (Connection reset by peer))
Caarrie has joined #tikiwiki | [11:13] |
| sylvieg | nelek :http://doc.tikiwiki.org/Module+adsense&structure=Documentation | [11:20] |
| *** | luminoso has quit IRC ("Leaving") | [11:30] |
| jonnyb has joined #tikiwiki
jonnyb has quit IRC (Client Quit) | [11:39] | |
| gezza has quit IRC ("Page closed") | [11:53] | |
| Caarrie is now known as Caarrie|away | [12:06] | |
| ..... (idle for 22mn) | ||
| changi|bed is now known as changi|trip | [12:28] | |
| pascalstjean has joined #tikiwiki | [12:42] | |
| luciash | nelek: use {literal} around the JS code | [12:43] |
| pascalstjean | I've been trying to install Trunk. everything goes well during installation. But Tiki gives me error saying that my DB might be corrupt when its time to access site. Any ideas why this is happening? BTW Branch 3.0 installed just fine so I know that MySQL is running properly. Thank you all in advanced | [12:44] |
| luciash | hi pascal
fresh install or upgrade ? | [12:44] |
| pascalstjean | new install
I have an old Trunk install online that works fine when I SVN Update but I have a presentation next week and looking to deploy Locally incase internet is Unstable | [12:48] |
| luciash | hm, i haven't tried fresh mysql install recently
can you check your mysql ? | [12:49] |
| *** | gezza has joined #tikiwiki | [12:49] |
| luciash | if any db tables are corrupt ?
you can repair them if your mysql reports and db table as corrupt during check | [12:49] |
| pascalstjean | any tips on how I can check for corrupt tables? I'm not very familiar with MySQL Administration but if you have a link somewhere I'm sure I can figure it out | [12:50] |
| luciash | SQL: check table_name;
repair table_name; iirc but phpMyAdmin maybe have some tool to do that | [12:50] |
| pascalstjean | is there a way to recursivly to check all tables in one command?
SQL check *.* or something? | [12:51] |
| luciash | i have no idea... i only remember when using mysql console i was always warned about corrupt tables when i logged in...
it's long time ago though i had this | [12:52] |
| pascalstjean | ok I'll check it out. Thanks | [12:52] |
| luciash | since then i don't like mysql for corrupting a lot on one of my sites ;) | [12:53] |
| ☕ | [12:58] | |
| re
but imho this is rare for fresh installs... i spell a bug i smell, even :) | [13:08] | |
| .... (idle for 16mn) | ||
| *** | jonnyb has joined #tikiwiki | [13:24] |
| .... (idle for 18mn) | ||
| pascalstjean | agreed, I just repaired all tables and still getting the same results. Looks like a bug | [13:42] |
| CIA-56 | tikiwiki: 03jonnybradley * r22632 10/trunk/lib/core/lib/Perms/Reflection/Global.php: [FIX] Prevent tiki_p_admin being removed from Admins | [13:50] |
| *** | larryg has joined #tikiwiki | [13:56] |
| larryg | @luciash - thanks for your assistance with my <Find> problem yesterday. As an experiment, I opened at trial account on a different hosting service, and uploaded identical files and data.. My size-related Find and Multi-Print problems disappeared! | [13:58] |
| *** | shawnadler has joined #tikiwiki | [14:05] |
| SEWilco2 has quit IRC ("Leaving.") | [14:10] | |
| gezza | polom
is dev down? | [14:11] |
| jonnyb | p2
i was just wondering that - so i guess it is :( | [14:12] |
| gezza | :(
it is down quite often | [14:12] |
| *** | SEWilco2 has joined #tikiwiki | [14:13] |
| gezza | also trying to upload some pics to community site, but upload to file gallery gives me blank page
hmm, category browsing too | [14:14] |
| jonnyb | i was just trying to get to Tiki4 | [14:15] |
| marclaporte | gezza: changi & amette & ohertel are sysadmins for *.tw.o domains | [14:16] |
| jonnyb | other pages seem ok... | [14:16] |
| *** | jonnyb has quit IRC () | [14:20] |
| luciash | larryg: np, i hope you figure it out for your server | [14:29] |
| .... (idle for 15mn) | ||
| *** | larryg has quit IRC (Ping timeout: 180 seconds) | [14:44] |
| gezza | when I make svn update for trunk I always get for libjquery "External failed" - how can I fix this? | [14:52] |
| marclaporte | gezza, there is a command to ignore externals (it won
't fix, but at least, you'll be able to continue) | [14:55] |
| *** | luminoso has joined #tikiwiki | [14:56] |
| gezza | marc: thanks, I am using tortoise on vista, is it a setting here? actually it continues for a few lines after the error
so I think it is not stopping | [14:57] |
| marclaporte | no idea about tortoise
but I think it's a cool name | [15:10] |
| gezza | marc: :) ok | [15:14] |
| marc: I created an "Assigned To Group" field in the wishlist tracker and would like to populate it with the names of the communty teams
what would be the best way to do? create on dev or in community and move via intertiki? or? | [15:20] | |
| *** | gezza_ has joined #tikiwiki
gezza_ has quit IRC (Client Quit) | [15:30] |
| marclaporte | gezza : all groups are created on the community site
You could make a group TeamAll and include all the Team* groups stuff will propagate via InterTiki BUT I think you a feature request here (interesting) someone asked me about this yesterday So you want a short list of people in group X to assign stuff to | [15:33] |
| gezza | yes
just checked on dev the list of groups i dont see there the groups of community the idea would be that "Assigned to person" is a member of the "Assigned to group" | [15:36] |
| *** | btiffin has joined #tikiwiki | [15:39] |
| gezza | i wanted to make a group selection item in the tracker and limit the selection options to the teams of two | [15:39] |
| marclaporte | gezza : please create groups on dev with the same names than on community site
and group membership should transfer automagically | [15:42] |
| gezza | marc: i see, so intertiki does not replicate groups, only memberships? | [15:44] |
| marclaporte | looks like it
and perms can be different on each site gezza : I do not know how you can limit the selections to members of a group (ex.: assigned to), but I hope it's possible If not, please make a wish | [15:44] |
| gezza | just checked, on dev intertiki group import setting is limited to "Registered,Admins,Developers,DevTwoAdmins,Security" | [15:45] |
| marclaporte | ah
good catch | [15:46] |
| gezza | is it ok to remove?
if it wont mess things up.. :) | [15:46] |
| marclaporte | just add what you need
I guess you want them all :-) | [15:47] |
| gezza | :) | [15:48] |
| marclaporte | I don't think it'll mess up, but we'll find out soon enough | [15:48] |
| gezza | yes, so I leave it empty
than everything should come over everything = all groups of community :) | [15:48] |
| ...... (idle for 28mn) | ||
| *** | grobda24 has joined #tikiwiki | [16:17] |
| grobda24 | Is this a known bug. My YouTube vid load when previewed but not in the full article ... http://mindfreedom.org.uk
? I have tried {literal} tags as suggested in the docs but it does the same. I would really like to get this video to embed | [16:18] |
| marclaporte | what is the exact code you are using? | [16:20] |
| *** | gezza has quit IRC ("Page closed") | [16:21] |
| grobda24 | marclaporte, {FLASH(movie="http://www.youtube.com/v/OmnzbevlRaA",width="560",height="340")}{FLASH} | [16:26] |
| *** | ohertel has joined #tikiwiki
ChanServ sets mode: +o ohertel | [16:28] |
| ohertel | Hello! :) | [16:28] |
| *** | jonnyb has joined #tikiwiki | [16:30] |
| marclaporte | oliver! | [16:30] |
| ohertel | switching tw.o to t4 today? or done already? | [16:30] |
| CIA-56 | tikiwiki: 03pkdille * r22633 10/trunk/ (7 files in 2 dirs): [MOD] removing functions in loops. Better fix than r22541. Thks Sylvie | [16:32] |
| ohertel | Do we have a 4.0 branch or is this trunk yet? | [16:33] |
| marclaporte | I don't know, but it would I think it would be good to shake out bugs
ohertel: no branch4, but I think we should do. We have two problems/decisions to do before 3.3 needs to be released urgently because 3.2 has fatal error if you use any of the 15-20 secure plugins #2 release script needs to be checked to see if we can call branch with the name "branches/4" instead of "branches/3.0" #3 : we need to decide about branching strategy branch now, and merge script to trunk (My current favorites) | [16:33] |
| grobda24 | marclaporte, any ideas ? | [16:42] |
| marclaporte | that looks fine
does it work in a wiki page? | [16:44] |
| *** | chealer has joined #tikiwiki | [16:47] |
| marclaporte | grobda24: works here: http://tikiwiki.org/Test | [16:47] |
| grobda24 | marclaporte, hmmm ... it being displayed on my front page within the articles plugin | [16:48] |
| marclaporte | the articles feature? | [16:49] |
| grobda24 | The YouTube vid is in an article
marclaporte, your test is on a wikipage | [16:50] |
| marclaporte | ok
which version | [16:51] |
| grobda24 | v3.2 | [16:52] |
| marclaporte | so ohertel, what do you think?
grobda24: http://info.tikiwiki.org/article76 something is working | [16:58] |
| CIA-56 | tikiwiki: 03pkdille * r22634 10/trunk/lib/ (6 files in 4 dirs): [MOD] better not to have functions in the second argument in a for loop | [17:01] |
| grobda24 | marclaporte, oh :| | [17:02] |
| marclaporte | grobda24: my focus is releasing Tiki4, so I won't look into this further. If you can prove bug on Tiki4, I will look into it | [17:02] |
| grobda24 | I am in debug mode from a previous problem
k | [17:02] |
| marclaporte | grobda24: I see that plugin works in "heading zone"
but not in body http://info.tikiwiki.org/tiki-read_article.php?articleId=76 grobda24 : please check if already a bug report. If not, please add: http://dev.tikiwiki.org/Articles | [17:03] |
| chealer | pascalstjean: please show the actual error message | [17:06] |
| grobda24 | marclaporte, thanks for noticing that, I will try and make a bug report | [17:06] |
| marclaporte | I will delete test article
grobda24 : as a workaround, you could try: put video in wiki page. and from article, use pluginInclude to include wiki page | [17:07] |
| grobda24 | ok | [17:08] |
| *** | ohertel has quit IRC ("ChatZilla 0.9.85 [Firefox 3.5.3/20090824101458]") | [17:10] |
| pascalstjean | chealer: System Error
The following error message was returned: SQLSTATE[HY000] [2002] Invalid argument | [17:11] |
| CIA-56 | tikiwiki: 03jonnybradley * r22635 10/trunk/ (2 files in 2 dirs):
tikiwiki: [FIX] Fixed show disabled feature switch, no 2nd remove button on globals & few minor label changes tikiwiki: [ENH] Basic copy/paste perms function | [17:14] |
| *** | SEWilco2 has quit IRC (Read error: 110 (Connection timed out)) | [17:18] |
| CIA-56 | tikiwiki: 03jonnybradley * r22636 10/trunk/tiki-objectpermissions.php: [FIX] Only paste perms once (for safety - you can always copy again) | [17:21] |
| chealer | pascalstjean: is that all? | [17:25] |
| jonnyb | so... we branchin' ? :) | [17:29] |
| *** | SEWilco2 has joined #tikiwiki | [17:33] |
| pascalstjean | chealer: yes | [17:41] |
| chealer | pascalstjean: what makes you think your database would be corrupt? | [17:42] |
| pascalstjean | try doign a fresh install you will see the same. I've treid 3 fresh installed on 3 different systems. Desktop, Laptop and Online Account. | [17:42] |
| luciash | do i see it correctly that trunk stays main devel and we need proposed branch for branches/4 and quality team will continue to backport proposals from trunk until Tiki4 is released ? | [17:43] |
| jonnyb | jonnyb checks http://dev.tikiwiki.org/How+to+release
hi luciash - yes, nyloth's keen we should keep two 'proposed's | [17:43] |
| luciash | and when will branches/3.0 become discontinued (not "supported") ?
and hi jonny :) is he really keen about it or is it kind of british humour ? ;) | [17:46] |
| jonnyb | nyloth? decidedly not a brit :)
i can't seem to find a "how to branch" | [17:48] |
| luciash | jonnyb: there's a script for that in devtools | [17:50] |
| jonnyb | i'm guessing i just do: php doc/devtools/svnbranch.php branches/4.x on a clean checkout of trunk - whaddayathink? | [17:51] |
| luciash | yes | [17:52] |
| jonnyb | mainly (well, 2 things) - are we ready? and should it be called branches/4.x ?
i like 4.x better than just 4 | [17:53] |
| luciash | i guess it is the same as on http://dev.tikiwiki.org/tiki-index.php?page=SVNTips#Experimental_branches
i am not ready until i know where to commit then ;) | [17:54] |
| jonnyb | that's where i was looking for inspiration
me neither! shall i just have a go? the plan (i think) for 3.x is to keep it going (apart from security stuff) until 5.0 | [17:54] |
| luciash | ah, ok, so then we really will have two proposed branches
are you fine with that ? i thought 3.3 will be the last :-p after 4.0 is released | [17:58] |
| jonnyb | should be - i think, but lots of people are upgrade-averse | [18:00] |
| chealer | jonnyb: 4.x is no more meaningful than 4, so why not choose the shorter form? :) | [18:00] |
| jonnyb | 3.3. should go out asap, cos 3.2 had Bad Things in it :(
i like the mysteriousness of the .x ;) | [18:01] |
| luciash | well, maybe i prefer 4.x too as it indicates there will be some more releases like 4.0, 4.1, etc. | [18:01] |
| chealer | jonnyb: see for example http://websvn.kde.org/branches/KDE/ (4.3 is a KDE version series) | [18:02] |
| jonnyb | also "4" is just an integer, doesn't seem significant enough | [18:02] |
| luciash | 4 sounds like an error
:) | [18:02] |
| jonnyb | yy | [18:02] |
| *** | grobda24 has left "Leaving" | [18:02] |
| luciash | bad things ? i thought only one bad thing ;) | [18:02] |
| jonnyb | well yes, one Bad Thing (but affecting 20 or so plugins) | [18:03] |
| luciash | yep yep
i thought it's only for fresh installs but from the recent chat here i realized upgrades with "secured" plugins are also affected ? | [18:03] |
| jonnyb | there almost should be a 3.2.1 (if we had the resources)
just the tiki.sql fix | [18:04] |
| luciash | resources ?
ah, but there are gonna be another quality approved goodies in 3.3 so it can't hurt ;) | [18:05] |
| jonnyb | ok, i'll give it a go...
indeed | [18:06] |
| luciash | jonnyb seems impatient tonight ;) | [18:07] |
| jonnyb | resources would be more nyloths, in this case | [18:07] |
| luciash | well, anybody can release if he takes the release manager role
he|she | [18:08] |
| jonnyb | well, i keep adding more stuff to it - just can't resist! | [18:08] |
| luciash | brb, just need to take a shower | [18:08] |
| jonnyb | and it's now 9 days overdue | [18:08] |
| luciash | btw, i need to add two things to trunk but i haven't found solution yet :(
so i would maybe prefer if you branch after shower ;) or some hours later *g* now i am really afk, bbl | [18:09] |
| CIA-56 | tikiwiki: 03jonnybradley * r22637 10/branches/4.x/: [BRANCH] Creation, trunk 0 to 22636 | [18:15] |
| jonnyb | cooo - was just testing whether i'd made the right fix to the branch script ;)
looks like it worked then - sorry luciash | [18:15] |
| CIA-56 | tikiwiki: 03jonnybradley * r22638 10/trunk/doc/devtools/svntools.php: [FIX] Allow 'x' as the second part of stable branch names (e.g. branches/4.x) | [18:18] |
| jonnyb | marclaporte: are you there? it seems i have done branches/4.x - i was mainly testing a fix to the branch script, but it worked! I had intended to check properly with you and anyone else concerned before actually doing it... | [18:21] |
| CIA-56 | tikiwiki: 03sylvieg * r22639 10/trunk/ (4 files in 2 dirs): [MOD] lesser magic deployment (1 tab of fgal)
tikiwiki: 03jonnybradley * r22640 10/branches/4.x/tests/example.txt: [TEST] Checking the new 4.x branch | [18:29] |
| chealer | I don't suppose there is a "forward-annotate" tool, for example to find when a line disappeared from a file? | [18:42] |
| jonnyb | chealer: not that i know of, but i usually find blame takes too long... | [18:46] |
| chealer | jonnyb: ok. well, yeah, but blaming is so cool :) | [18:47] |
| jonnyb | i'm getting "Could not find previous merge. Impossible to merge automatically." on the merge-back-to-trunk script (branchupdate.php) | [18:48] |
| luciash | re | [18:49] |
| jonnyb | hi luciash - i seem to have made 4.x
(testing the script) | [18:50] |
| luciash | fine, then it will be not in 4.x what i wanted... | [18:50] |
| jonnyb | not necessarily | [18:51] |
| luciash | i have to figure out myself | [18:51] |
| jonnyb | we could delete it and do it again later | [18:51] |
| luciash | heh | [18:51] |
| jonnyb | but i can't get trunk to merge changes from it | [18:51] |
| luciash | you need to tag the revisions to make the merges work, no ? | [18:51] |
| jonnyb | oh? (not sure what that means)
i get: Could not find previous merge. Impossible to merge automatically. | [18:52] |
| luciash | at least we tagged at the CVS times, not sure if we still do with SVN | [18:53] |
| jonnyb | tagging is for releasing i thought | [18:54] |
| luciash | when i merged i did with tagging | [18:54] |
| jonnyb | i'll try subclipse... | [18:54] |
| luciash | seems it's looong time i last merged anything using Eclipse ;)
see in Aptana if there are some tags in the history | [18:54] |
| jonnyb | i've done a fair bit on merging experimental (very mental) branches | [18:55] |
| luciash | okay, seems it's not necessary then anymore... don't know what your error could be else then
maybe the .x still somewhere | [18:56] |
| jonnyb | could be
jonnyb checks for other sneaky preg_replacements | [18:57] |
| CIA-56 | tikiwiki: 03chealer * r22641 10/trunk/templates/ (header.tpl tiki-edit_translation.tpl translated-lang.tpl): [FIX] HTML special chars encoding | [19:09] |
| marclaporte | polom
jonnyb : me reads log about branching | [19:13] |
| jonnyb | poloms
just thinking about kil'ing it - sending a mail to svn list... | [19:14] |
| marclaporte | jonnyb: : 4.x is better than 4.0 , but why not just 4? | [19:16] |
| jonnyb | 4 just looks like an error (as luciash said) | [19:16] |
| marclaporte | ok, I am reading log
luciash: ; we have to decide about http://dev.tikiwiki.org/Version+lifecycle ok, I am with chealer on this that short is better. But 4.x is very good too. And as long as it's no longer 4.0 :-) | [19:17] |
| chealer | yeah :) | [19:23] |
| luciash | polom marc | [19:23] |
| marclaporte | so I am ok with your & luciash's choice
let's just get this show on the road! now about merging 1- how can we have people fix on branches/4.x for the next three weeks, and those fixes merged to trunk via script? | [19:23] |
| jonnyb | think i'm stuck - the script doesn't want to merge from 4.x to trunk | [19:24] |
| luciash | btw, i was searching the branch or not to branch page but couldn't find it (as anonymous) | [19:24] |
| marclaporte | bad search engine?
or perms? | [19:24] |
| luciash | marclaporte: on dev and community
marclaporte: i don't know, is the page with perms ? | [19:24] |
| marclaporte | http://www.google.com/search?rlz=1C1GGLS_enPT291CA306&sourceid=chrome&ie=UTF-8&q=to+branch+or+not+to+branch+tikiwiki | [19:25] |
| luciash | jonnyb: is it needed ?
jonnyb: i mean it's not the same as experimental branch jonnyb: isn't it ? jonnyb: i expected not to merge to trunk from that branch i thought we will do the other wayy around actually, as with proposed branch | [19:25] |
| jonnyb | luciash: i thought that's what we did the past few times (merge from branches/x.x to trunk?) | [19:27] |
| marclaporte | and (this is the most important issue) 2- We need to be able to delete some stuff from branches/4.x and not have those deletes propagate (because we can give more time for these things to evolve) BUT all the same time, we want fixed to branches/4.x to be merged up How do we tell the system to merge up certain revisions but not others. And how do we keep track? | [19:27] |
| jonnyb | v good questions marclaporte | [19:28] |
| luciash | ok, then i must be wrong again (as usual)... i just thought it would make more sense than trying to force everyone to work on branch 4.x | [19:29] |
| chealer | I agree with luciash - no merges to trunk | [19:30] |
| jonnyb | hmm - i thought the idea was to get everyone focussed on the new release? | [19:30] |
| luciash | weren't we focused enough in trunk ? ;) | [19:31] |
| marclaporte | both options are valid | [19:32] |
| jonnyb | jonnyb thinks food might help - will be lurking | [19:32] |
| luciash | we are all focused on 4.x release, i thought the branching will be just clear signal that in that branch will go no more new features | [19:32] |
| marclaporte | but in the past, we made branches/3.0, and merged to trunk | [19:32] |
| luciash | yes, we did, but i am not sure it worked very well (sylvie's merge pain)... i think the way as with proposed branch works better | [19:34] |
| marclaporte | proposed branch is very time consuming as well
I think backporting is more expensive than forewardporting but I am not saying which one we should choose I am OK with both. We just need to agree | [19:35] |
| luciash | but on the other hand only good things get in and we can be sure we don't release something unfinished / weak / unstable | [19:36] |
| marclaporte | LP and CoE have some Tiki5 commits to do. So trunk would be nice for them
in any case, I think the only debate is "when" a few days before, at the latest, we need to have branched so we need to make sure script can work with 4.x instead of 4.0 tks jonnyb for looking at this I know many people will say: "Use Git", but this is not one of the options at the moment. These people should promote this idea at the appropriate time :-) | [19:36] |
| luciash | heheh | [19:39] |
| marclaporte | :-) | [19:39] |
| luciash | also you can clean and kil as you need in the branch 4.x if we go the backport way
while keeping things on track in trunk | [19:40] |
| marclaporte | yes
so maybe relaxed procedure for backports would be in order (not QT) and QT starts at 4.0 release | [19:40] |
| luciash | yup, sounds fine to me | [19:41] |
| marclaporte | now, we need to remove some stuff from trunk. I can tell people, go put your stuff in experimental
I am just wondering what is most efficient / least overhead | [19:42] |
| luciash | so branch 4.x will be something like "pre-proposed" where quality team can rollback if anything inapropriate gets in, but they don't have to approve and backport to stable 4.x yet
at time of 4.0 release, this branch will become stabilzed (what 3.0 is now) and new proposed for 4.x will be created | [19:43] |
| marclaporte | luciash : so basically, this is a 3rd proposal. Can you explain here: http://dev.tikiwiki.org/How+to+release#To_branch_or_not_to_branch
A benefit is that more of us will learn to use QT scripts but it's got to be easy & quicky. Because there will be 500, maybe 1000 commits still until 4.0 So if we add overhead & complexity to each of these commits, we lose people and code However, the good thing is QT backport scripts are (I think) intended to be very chirurgical (I want to backport this commit, but not this one) | [19:45] |
| luciash | ah, now i know why i couldn't find the page ;) | [19:47] |
| marclaporte | you thought it was the name?
refactor to new page if you think it's better :-) I love wikis | [19:47] |
| luciash | yep, i searched by page name | [19:48] |
| marclaporte | refactoring is a prime example of why I love wikis. In Tiki4: you could add "To branch or not to branch" as an alias to the page, and find it in page name search (Thanks to Alain Desilets) | [19:49] |
| chealer | yes, commit approvals are orthogonal to the question of merging to trunk or not | [19:49] |
| luciash | marclaporte: is it not possible to add alias in 3.x for that already ? | [19:50] |
| marclaporte | yes, you can add alias. But won't be in page name search | [19:51] |
| chealer | it's possible to work on branch 4 first, but it creates issues: 1. that's different from what we're used to. 2. it's in the order of things that fixed are done on trunk first. 3. nobody has to do merges.
one advantage is that there's no need for everyone to commit to 2 places. | [19:51] |
| luciash | ah | [19:52] |
| chealer | but I see no reason why the procedure should be different before and after release | [19:52] |
| luciash | but i can create a page and put redirect ;) | [19:52] |
| marclaporte | chealer: tks for your updates on http://dev.tikiwiki.org/DevTips | [19:54] |
| luciash | chealer: yep, as I see it, devs will have self-interest to backport what they create and test on trunk if they want it ever released ;) | [19:54] |
| marclaporte | luciash: , yes for redirects, but we try to avoid, as it's "pollution" | [19:55] |
| luciash | ok
sure, redirects are better in .htaccess (when necessary) | [19:55] |
| marclaporte | marclaporte hopes to manage .htaccess from Tiki one day :-) | [19:59] |
| chealer | it also avoid merge bugs, since it's much easier for the person who fixed a bug to verify the backport than for whoever happens to be doing a merge | [19:59] |
| marclaporte | so chealer, can you vote here: http://dev.tikiwiki.org/How+to+release#To_branch_or_not_to_branch ?
and any arguments for/against any and add arguments for/against any | [20:00] |
| luciash | i am editing, wait pls | [20:01] |
| marclaporte | chealer: I am worried indeed about double merge | [20:01] |
| chealer | marclaporte: what do you mean by double merge? | [20:02] |
| marclaporte | oups, double work because of need to merge | [20:02] |
| chealer | marclaporte: I have an opinion on how to handle a branch, but I didn't really form an opinion on when to branch. it's also been a while since I saw a major Tiki release happen. | [20:04] |
| marclaporte | ok | [20:05] |
| chealer | marclaporte: personally, as long as I don't do stuff which can't I can't commit (and I don't think that will be the case), I have no issue with branching later. I could list myself as undecided... | [20:06] |
| luciash | saved the page, you can add under benefits pf erging from branch to trunk if you have some ;)
marclaporte: i created "To merge or not to merge" there instead ;) | [20:16] |
| marclaporte | hahahaha | [20:18] |
| luciash | bbl | [20:18] |
| chealer | :)
luciash: I don't understand "only tested things (bugfixes, UI enhancements) get in from trunk (no new features after feature freeze/branch creation) and we can be more sure we don't release weak / untested / unstable" luciash: isn't that just a benefit of branching early? | [20:27] |
| luciash | re
depends on the stream which direction it flows ;) if backporting way then yes, but before we thought only about merging way back to trunk so i preferred to branch as late as possible | [20:29] |
| chealer | luciash: I see that could make sense explaining why you prefer to have to the flow in this direction, but it doesn't make sense to me as an argument. someone who prefers merging to trunk could argue that he would be for an earlier merge if fixes flow from branch to trunk, and use the same argument.
luciash: I see that could make sense explaining why you prefer to have the flow in this direction, but it doesn't make sense to me as an argument. someone who prefers merging to trunk could argue that he would be for an earlier merge if fixes flow from branch to trunk, and use the same argument. | [20:35] |
| luciash | i prefer it also because we do like that with proposed and also that i am not forced to switch to another branch when i have some work-in-progress in trunk ;) | [20:37] |
| chealer | luciash: yes, I agree with those reasons | [20:40] |
| .... (idle for 18mn) | ||
| luciash | only problem remains about the manpower split ;) if the devs feel comfortable to contribute to the release or are forced to work on working on finishing the release
*forced to work on make the release happen in time anyway i think there are much more benefits now, than disadvantages | [20:58] |
| ..... (idle for 23mn) | ||
| *** | changi|trip has quit IRC (Read error: 110 (Connection timed out)) | [21:25] |
| CIA-56 | tikiwiki: 03chealer * r22642 10/trunk/ (3 files in 2 dirs):
tikiwiki: [ENH] change translation module to new module style (modules-doc). tikiwiki: [FIX] HTML special chars encoding tikiwiki: [FIX] colons inside tr blocks tikiwiki: [FIX] undefined show_translation_module notice tikiwiki: show completeness even if 0% | [21:26] |
| *** | marclaporte has quit IRC ("Miranda IM! Smaller, Faster, Easier. http://miranda-im.org") | [21:32] |
| ..... (idle for 20mn) | ||
| jonnyb has quit IRC ("I am going outside... I may be some time...") | [21:52] | |
| ..... (idle for 22mn) | ||
| FrankP_german has quit IRC ("Nettalk6 - www.ntalk.de") | [22:14] | |
| CIA-56 | tikiwiki: 03pkdille * r22643 10/trunk/ (5 files in 3 dirs): [MOD] lesser magic deployment to forum admin template | [22:26] |
| sylvieg | :-( itis the third time I have problem with upgrade .. people put their files in files/ - and somebodu created files/
and svn .. whatever does not support diff with 'funny' files | [22:38] |
| luciash | hrmph | [22:52] |
| sylvieg: but i see no files in there coming from svn in trunk | [22:57] | |
| sylvieg | files/templates/listpages/smarty-tikiwiki-1.0-shortlist.txt
is a regular file | [22:58] |
| luciash | just index.php and templates/
ah haven't noticed svn blames lph | [22:58] |
| sylvieg | so for only one little file .. we have to deal with tons of svn diff problems :-(
people usually create dir in the tiki root - not outside tiki root | [23:00] |
| luciash | but i have cron svn upping here with no problem... what diff problems you have ? | [23:01] |
| sylvieg | thre is some files - no idea what they are - svn bugs | [23:01] |
| luciash | i see only this txt here | [23:02] |
| sylvieg | my problem is that people were used to use files/ as the directory for files
but now it is a svn dir | [23:03] |
| luciash | yep, and it conflicts ? | [23:03] |
| sylvieg | I have no idea - why svn stops on some files there
no conflicts - just svn is not happy and stops to do any diff - status | [23:03] |
| luciash | hmm | [23:04] |
| sylvieg | so each time I have to move the files directory somewhere else
to have sn running | [23:04] |
| luciash | weird, it doesn't happen here | [23:05] |
| sylvieg | but for ONE file in files/.. bad naming choice in tw
me too - should be some micosoft file svn does not like.. | [23:05] |
| luciash | any command you want me to try ? | [23:06] |
| sylvieg | it is the 3- sites it happens to me.. | [23:06] |
| luciash | ah, linux here, sure | [23:06] |
| sylvieg | svn status- or svn diff | [23:06] |
| luciash | works fine on linux | [23:07] |
| sylvieg | - just a lot of energu to spend on this for only one bad naming files in tw | [23:07] |
| luciash | sorry i cannot reproduce your problem, no windows svn here | [23:08] |
| sylvieg | sylvieg pretty close to move smarty-tikiwiki-1.0-shortlist.txt to antoher dir
files-tw | [23:08] |
| *** | marclaporte has joined #tikiwiki
ChanServ sets mode: +o marclaporte | [23:11] |
| luciash | yes, i would say tiki_files (as we have tiki_tests), but we still need index.php in files/ in SVN, nope ? | [23:11] |
| sylvieg | it is just that people have the bad idea to put all their files in files under tikiroot - seems to be a 'natural' way | [23:12] |
| luciash | sylvieg: or you just can put 6*, etc. in your svn:ignore like me
usually people don't run SVN on their productivity servers so putting 6* in svn:ignore will help you on these 3 sites or whatever the files start | [23:12] |
| sylvieg | yeh worse - they copy their files to the new upgrades files | [23:14] |
| luciash | so just put * in your svn:ignore properties for that files/ dir ;)
sylvieg: try svn propset svn:ignore * files/ | [23:14] |
| sylvieg | yes but if I do that - the lph file will not be sync anymore... | [23:16] |
| luciash | yep, but is it that important file ? | [23:17] |
| sylvieg | no idea :-) you get the point | [23:17] |
| luciash | i am not sure if it applies on subdirs moreover
the svn:ignore i think it applies only on files in files/ not in subdirs you can try put there test.txt next to the lph file and svn status if it will say something about the file after you have the svn:ignore set | [23:17] |
| *** | luminoso has quit IRC (Read error: 110 (Connection timed out)) | [23:24] |
| luciash | hold on | [23:25] |
| sylvieg | btw luciash is there a 4 branch - I was not looking a t my computer all teh day
and guy you talk a llt lot | [23:26] |
| luciash | jonny just tested it
the creation it worked with branches/4.x but he got some problems when he tested merging to trunk (which i think we don't need) :-p | [23:26] |
| sylvieg | we need merging 4 to trunk a lot of time
why nelson the guy who did all the branches since.. was not on this one | [23:28] |
| luciash | depends what way we decide to go | [23:28] |
| sylvieg | does nyloth and other will support the amount of work?
I will probably not tiki4 is not ready | [23:29] |
| luciash | you don't have to approve anything, just rollback if you're not happy ;) | [23:30] |
| sylvieg | about 10 problems I know about that must be solved | [23:30] |
| luciash | do you like merging to trunk more ? i thought you don't like merges hell | [23:31] |
| sylvieg | merging 4 to trunk if done often is ok
we lost the history - but.. backport trunk to 4 - is ... time consuming | [23:31] |
| luciash | please write the benefits at http://dev.tikiwiki.org/How+to+release#Benefits_of_merging_from_branch_to_trunk
i see only one - the faster devel | [23:32] |
| sylvieg | I do not understans | [23:33] |
| luciash | http://dev.tikiwiki.org/How+to+release#Benefits_of_backporting_from_trunk_to_branch
i listed my idea there | [23:34] |
| sylvieg | :-( guys you need to feel the pein to merge or to backport | [23:35] |
| luciash | i did backports to proposed and it is not that bad when one does it with his own code he knows
worse is merging code you don't know i think so what is worse for you ? merge to trunk or backport to branch ? | [23:36] |
| marclaporte | forward ports are less expensive than backports though | [23:37] |
| luciash | marclaporte: i don't understand | [23:37] |
| sylvieg | sorry it is funny to have the opininon of people who never pratice merge - backport - cherrypicking . Utopia is an ideal word is very good | [23:37] |
| marclaporte | say we have 50 commits to manage | [23:38] |
| luciash | sylvieg: i did merge in the past
not recently though, true | [23:38] |
| sylvieg | between a tikix and a tikitrunk - I did for at least 3 releases - it is 1 hour each day | [23:39] |
| marclaporte | Each merge is a potential regression. And regressions in branches/4.0 are more expensive/problematic than regressions in trunk.
and in theory, all fixes in branches/4.0 are supposed to go in trunk (until the code diverges too much) | [23:41] |
| sylvieg | but in trunk I get nothing from svn log
why spending so much time time to have sn log in tiki3 | [23:42] |
| marclaporte | so what is your preference sylvieg? | [23:42] |
| sylvieg | and only automaitc merge in tikitrunk
dev need to know we do an automaic merge proposed to back we do a cherry picking form back to trunk | [23:42] |
| *** | Caarrie|away is now known as Caarrie | [23:45] |
| sylvieg | me as a dev wants to know easily the history - me as a production site does not care if somebody checks to commit | [23:45] |
| luciash | please correct me, what is bad on fixing in trunk, testing in trunk and if it's good backport to branch 4.x ?
you think devs will not listen ? | [23:45] |
| sylvieg | and me as a dev will feel painfuul to have a 'almost' release more than a month | [23:46] |
| luciash | will just keep working on trunk and not to care about backporting and someone else will have to do it ? | [23:47] |
| sylvieg | because we do not have history in trunk svn log - with the way we do today
I am a dev - I want a COMPLETE svn log on the latest today I have 'automatic merge' the time a pre-release is released .. so - my idea - is to do automatic merge proposed - to tikix and do 'cherry picking' from'a almost a pre-released version to trunk if pre-released does not exist - fine for me but he latest pre-released was 1 or 2 months sylvieg needs to work on a svn script to go from tikix to trunk /me needs to convince nyloth to spend all his energy to the future and not to the past | [23:47] |
| luciash | luciash never understood the 'automatic merge' when one needs to check it carefully and resolve conflicts manually | [23:53] |
| sylvieg | we are VERY LUCKY bacport to tikix works - because of nyloth
thx to him | [23:53] |
| luciash | yep, and i like it | [23:54] |
| sylvieg | automatic merge is a pain when it lats more than ... a month
luciash: why do you need to ned the history/log is a version that is released | [23:54] |
| luciash | or when someone indents the code or when ... or when ... ;) | [23:55] |
| sylvieg | .. whatver | [23:55] |
| luciash | sorry ?
i am sorry i didn't understand the "why do you need ..." | [23:56] |
| sylvieg | ...... we only need a script that commits each commit from tikix to trunk - and through away automatic merge - | [23:59] |
| luciash | sylvieg: but i believe you know what fits you best :) i just don't know what you prefer yet... so you prefer force everybody to switch to branch 4.x and work there and do "automatic merge" often ? | [23:59] |
| sylvieg | if devs an do 'individual' merge to back and trun nice | [23:59] |
| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |