***: nkoth has quit IRC (Read error: 110 (Connection timed out))
nkoth_ is now known as nkoth
ricks99 has quit IRC ("Get more help: TikiWiki for Smarties http://twbasics.keycontent.org")
Caarrie|away is now known as Caarrie
Caarrie has quit IRC (Remote closed the connection)
Caarrie has joined #tikiwiki
Kimberliee has joined #tikiwiki Kimberliee: g'evening. ***: Kimberliee has quit IRC () CIA-50: tikiwiki: 03ricks99 * r23590 10/branches/4.x/templates/tiki-referer_stats.tpl: [FIX]column name should be DOMAIN not WORDS ***: Lucymoz has joined #tikiwiki
Zylogue has quit IRC ("Leaving")
Lucymoz has quit IRC (Read error: 104 (Connection reset by peer))
Lucymoz has joined #tikiwiki
Lucymoz has quit IRC (Client Quit)
Lucymoz has joined #tikiwiki
ricks99 has joined #tikiwiki
btiffin has joined #tikiwiki ricks99: 3d wiki browser does not seem to support multilingual page names?
known issue?
or maybe just an encoding problem? ***: Caarrie is now known as Caarrie|sleeping
nkoth_ has joined #tikiwiki
nkoth has quit IRC (Read error: 110 (Connection timed out))
nkoth_ is now known as nkoth
gozer_ has joined #tikiwiki
ibrrorg has joined #tikiwiki ibrrorg: is there a way to remove the pencil icon for edit section in tikiwiki 3.1? i don't really want it there and would much rather just edit it as a whole document ricks99: turn off the "edit section" option ibrrorg: thank you ricks99: yw CIA-50: tikiwiki: 03chibaguy * r23591 10/branches/4.x/styles/layout/ (layout-reference.css layout.css): [FIX] Floated divs for content columns (see http://themes.tikiwiki.org/Floated box demo) need !important to override general wikitext .box no float. ***: chibaguy has joined #tikiwiki
ChanServ sets mode: +o chibaguy chibaguy: polom ricks99: moloq chibaguy: hi ricks99
how are things going? ricks99: finishing up the last of the turkey :) chibaguy: oh, I don't want to hear about it. My wife and son are visiting her sister in SF, and my daughter and I are here. Thanksgiving dinner there, normal stuff here. :-/
but we're not hungry, so can't complain. ricks99: 2 b honest, im about sick of turkey sandwiches, turkey soup, etc chibaguy: feel free to fedex some over ;-)
(why doesn't downloading work for the things that really matter? :-) ) -: ricks99 crams a drumstick into a fedex envelope for chibaguy :) ricks99: not sure what to do about the gravy.... chibaguy: ziplock? ricks99: good idea CIA-50: tikiwiki: 03ricks99 * r23592 10/branches/4.x/lib/ (5 files in 3 dirs): [ENH] working on the webhelp feature, in progress. Updating to use standard Tiki icons. Will now correctly generate content for the content.html page (based on browser title, site title, and site subtitle. ***: nkoth has quit IRC ()
Lucymoz has quit IRC (Read error: 110 (Connection timed out))
ibrrorg has quit IRC ("Page closed")
lupka has joined #tikiwiki
ricks99 has quit IRC ("Get more help: TikiWiki for Smarties http://twbasics.keycontent.org")
lupka has quit IRC (Client Quit)
chibaguy is now known as chibaguy|away
gps_1 has joined #tikiwiki
chibaguy|away is now known as chibaguy
franck has joined #tikiwiki gps_1: Hello - when using page selector field in trackerlist on a page - does page selector automatically enter the pagename in the tracker? ***: coaboa has joined #tikiwiki
coaboa has quit IRC (Read error: 113 (No route to host))
btiffin has quit IRC (Remote closed the connection)
chealer has joined #tikiwiki
gps_1 has left
coaboa has joined #tikiwiki
gozer_ has quit IRC ()
PrezKennedy has joined #tikiwiki
chealer has quit IRC (Remote closed the connection)
Wilkins has joined #tikiwiki
gozer_ has joined #tikiwiki
gozer_ has quit IRC (Client Quit) Tikiwiki|bot: Recent Bug: Tracker item: #2907 - - TW does not send e-mail. ... - http://dev.tikiwiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=2907 ***: schlumpf has joined #tikiwiki schlumpf: ...hi can someone help me with the tab plugin in tiki4.0 ***: kiilo has joined #tikiwiki Tikiwiki|bot: Recent Bug: Tracker item: #2908 - - Account disable after validating new account - http://dev.tikiwiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=2908 schlumpf: can someone help me with the tab plugin in tiki4.0 ***: schlumpf has quit IRC ("Page closed")
kiilo has quit IRC ("Leaving.") Beestje: wierd tracker export problem.... i have 2 websites, both 3.3. Exporting items from the testsite give the proper csv containing the data. exporting from the production website creates a csv containing the html code of the tracker webpage.
it appears to be the same problem for every tracker... marclaporte: different server? Beestje: no, same server
which makes me think it's some inconsistency in the database somewhere
i had the same problem exporting tracker items in 2.4 (and before)
i used to get the reports straight out of the db, but because there now is a tiki_p_export_tracker permission, users would be able to get the data themselves, which would save me a lot of time (if it worked) :)
aha... memory light bulb just flashed on and I remembered something that might be crucial to the problem ...
only difference between the two sites is the installation / upgrade method. For the test site I did a new reinstall (deleting all the old files) and for the production one I just did an upgrade
overwriting the existing files
i'll be back later, need food. I'll compare the files between the two different sites when i get back ***: ricks99 has joined #tikiwiki
kiilo has joined #tikiwiki
Caarrie|sleeping is now known as Caarrie
kiilo has quit IRC ("Leaving.")
luminoso has quit IRC (Client Quit)
debelan has joined #tikiwiki debelan: hi
i `v a problem
when i install tikiwiki on XAMMP Fatal error: Cannot redeclare class Zend_Filter_Interface in
anybody ? ***: kiilo has joined #tikiwiki debelan: help ?! Tikiwiki|bot: Welcome to the official Tikiwiki English Irc Channel. TikiWiki or better known as TW, is your Groupware/CMS (Content Management System) solution, you can get more infomation at http://info.tikiwiki.org/ . Beestje: debelan : perhaps this gives you more info - http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=2641 ***: brankom has joined #tikiwiki brankom: Hm... Any quick help on why ((link)) or ))link(( doesn't work for me? marclaporte: debelan : I can help
but Beestje was faster :-) ricks99: @brankom: if the page does not yet exist, tiki will have a ? instead of the link
what's the issue? brankom: It didn't actually show it as link.
It seems if it's withing brackets it won't work? ricks99: the ((...)) syntax is for a wiki link. you're tyring to link from one wiki page to another?
brackets [....] are for external links brankom: Hm... It seems to have issues with cyrillic letters -.- ricks99: for non-english letters, you ned to set the wiki syntax to "complete"
see docs for details http://doc.tikiwiki.org/wiki+config (i think) brankom: Thank you :) ricks99: yw Beestje: @marclaporte : it seems something in the DB is causing the tracker export problem.... i just copied the db from production to the testsite and now i'm unable to export the tracker there as well
*sigh* brankom: Heh, I didn't pay attention to that setting when configuring the thing :)
Tends to just slip by. ricks99: tiki.... always one more option! brankom: I actually tried to go through all the options and check that those are what I want. Beestje: any tips on how to start debugging this tracker export issue?
let me reprhase the problem for those who just popped in : I have 2 sites, both on the same server (3.3) On one, I can export the items and I get the proper csv containing data. On the other one I get a csv that contains the html code for the page.
when I move the db of production (which doesn't work) over to the testsite, it won't work on the testsite either ricks99: @brankom: more noob help: http://twbasics.keycontent.org/Configuring+the+Wiki (shamless plug) Beestje: copying the csv content to an html page gives me more info : http://pastebin.com/m726a8ee2
and a lot of php warnings
I dont' seem to have corrupt data in the tiki_tracker_items table.
error seems to be in " order by `` "
unknown column in order clause ***: brankom has quit IRC ("Page closed")
brankom has joined #tikiwiki
RavenC has joined #tikiwiki Tikiwiki|bot: New Forum Posts: Tiki arbeitet nur in Englisch! - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=10&comments_parentId=35440
New Forum Posts: Tiki doesn't work in German! - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=13&comments_parentId=35439 ***: Caarrie is now known as Caarrie|away luciash: polom Beestje: polom RavenC: morning everyone ricks99: hi luciash: heya all ***: marclaporte has quit IRC (Read error: 110 (Connection timed out)) Beestje: aha ... problem found : when I set the tracker's default sort order to a field that i have created myself, the tracker doesn't export properly.
when I set the default sort order to Created , then it does export properly luciash: Beestje: ah, good catch Beestje: yep finally :) checking the bugbox now to see if it's already been reported luciash: Beestje: cool, thank you
Beestje: or send a msg to devel list
is it 3.x ? Beestje: yes
but I also had the problem under 2.x
didn't have time to dig into it at that time, and didn't check it on 4.x because ldap seems to be broken luciash: ah, ok, we can fix for 3.x and 4.x only Beestje: already switched to 3.3 for the testing and production environment
so that'll work for me ;) luciash: yep, consider it as LTS ***: luminoso has joined #tikiwiki
kiilo has quit IRC (Read error: 113 (No route to host))
kiilo has joined #tikiwiki
grobda24 has joined #tikiwiki Beestje: uhm... problem on the site. forgot password, clicked on forgot password, received email, but I can't change my password because I can't remember my old one? ....
uhm... SOS ? ;)
am I missing something? chibaguy: heh, Tiki wants you to input your old password to reset the password that you can't remember? Beestje: yep chibaguy: hmm
I hope that's a bug and not somebody's idea of a good design. ;-) Beestje: kind of a little bit blocking my ability to submit or fix bugs at the moment :)
"it's not a bug, it's a feature!"
well, I've got the activation email and clicking on the link provided logs me in. there I can go to account information to reset my password but I need to supply the old one... unless there's a default password that's not mentioned anywhere I think it's a bug :) ricks99: @Beestje: what version? works on my 4.x there is no "old" pw field after clicking the link in the email Beestje: i mean on tikiwiki.org :) -: ricks99 thought tw.o was running 4.x? Beestje: clicking on the link did log me in, but i can't seem to change my password after that ricks99: on my 4.x, clicking the link takes me to the "change pw enforced" page
just tested on tw.o works for me
are you sure you were logged out completely? Beestje: hmmmm strange
now it works for me as well -: ricks99 thinks you were still logged in. cookie maybe? Beestje: i wasn't logged in at all ricks99: odd Beestje: cleared everything yesterday and last login before that might even be a few weeks ago
oh well, works for now
can anyone confirm that they can't export a tracker item when using a custom default sort order field when using 4.x ?
this way the bugreport will be a bit more accurate sylvieg: the sort field is specified at the tracker level or at the export level? Beestje: at the tracker level ***: debelan has quit IRC ("Page closed") CIA-50: tikiwiki: 03sylvieg * r23593 10/branches/4.x/tiki-export_tracker.php: [FIX]tracker: fix export when sort field is not the default one for a tracker sylvieg: Beestje: this commit should fix the problem ***: nkoth has joined #tikiwiki Beestje: ok then ... this thing was solved before my bug was submitted ... :D
http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=2909
thanks sylvieg !
is it the same for the 3.x tree? sylvieg: no there were no consideration of the sort in 3 Tikiwiki|bot: Recent Bug: Tracker item: #2909 - - Exporting tracker items does not work when selecting a custom default ... - http://dev.tikiwiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=2909 ricks99: anyone use wiki3d with multilingual wiki pages? my non-English page names are encoded incorrectly in the 3d browser :( sylvieg: ricks99: a very very old bug ... but we do not have ll the source of wiki3d - only luis can fix it I think ricks99: was looking in wikilib... is there an easy way to properly encode the return ($neighbors) array?
not that easy? :(
i see where it reads each to/from neighbor page and adds it to the array. ***: rodrigo_sampaio has joined #tikiwiki Beestje: @sylvieg : so if I want to have the tracker thing working for 3.3, I need to get the tiki-export_tracker.php file from cvs and put it in my 3.3 install? sylvieg: not sure at all it will work - you need to compare the both versions to see if no big chance
changes ***: Rodrigo has joined #tikiwiki Rodrigo: !help Tikiwiki|bot: You can get a more complete list of commands that work with this bot at http://tikiwiki.org/TikiBot . Beestje: @sylvieg : only change for 3.x is the same as on 4.x, but then on line 171 insted of 180 Rodrigo: Hi, I'm new to Tikiwiki and I'm trying to setup a wiki in my company's intranet, to allow the employees to share knowledge about our daily work. I've installed TikiWiki 4.0 and applied the "Collaborative_Community_4x" profile. Everything is working fine, except that I can't use structures. It seems to be disabled and I couldn't find a way to enable it (there is no option in the features administration panels). Can anyone help m Beestje: it should be under Admin / Wiki ricks99: ^ onthe features tab Beestje: then Features ***: gozer_ has joined #tikiwiki Rodrigo: Thanks! Now I see it ! I've spent several hours looking for it everywhere, and I didn't see it in the Wiki admin panel.
I somehow expected it to be present on the features adminstration panels. ricks99: strucures are for wiki only --not tiki-wiki. Admin:Features is for tiki-wide features Rodrigo: Ok, thanks for the explanation. Best regards ! ricks99: yw CIA-50: tikiwiki: 03pingus * r23594 10/mods/trunk/features/aulawiki/ (10 files in 5 dirs): [FIX] made to work on 3.x ***: Rodrigo has quit IRC ("Page closed")
SEWilco2 has quit IRC ("Leaving.")
nkoth has quit IRC ()
coaboa_ has joined #tikiwiki
Beestje has quit IRC (Read error: 104 (Connection reset by peer))
Caarrie|away is now known as Caarrie
coaboa has quit IRC (Read error: 110 (Connection timed out)) CIA-50: tikiwiki: 03sylvieg * r23595 10/trunk/installer/ (2 files in 2 dirs): [FIX]install: only one declaration of update_preferences when installing ***: grobda24 has quit IRC ("Leaving")
grobda24 has joined #tikiwiki
Beestje has joined #tikiwiki
brankom has quit IRC ("Page closed")
chibaguy has quit IRC (Read error: 104 (Connection reset by peer))
SEWilco2 has joined #tikiwiki
Beestje has left
ricks99 is now known as ricks99_away CIA-50: tikiwiki: 03sylvieg * r23596 10/trunk/ (2 files in 2 dirs): [FIX]mail: option to test the mail sending in admin panel ***: Beestje has joined #tikiwiki CIA-50: tikiwiki: 03sylvieg * r23597 10/trunk/ (2 files in 2 dirs): [FIX]mail: an error message is detectable ***: Rodrigo has joined #tikiwiki
Caarrie has quit IRC (Remote closed the connection) Rodrigo: Hi again. I'm having problems to display brazilian portuguese (pt-BR) characters in TikiWiki pages. Before diving into PHP/Apache/MySQL character set configurations, I would like your opinion, as it may be something in my TikiWiki setup. The strange thing is that some pages are loaded correctly while others are not. For example, the HomePage is OK, I can see typical portuguese "ç, ã, õ, etc.", but in other pages those letter ***: Caarrie has joined #tikiwiki
marclaporte has joined #tikiwiki
ChanServ sets mode: +o marclaporte CIA-50: tikiwiki: 03pingus * r23598 10/mods/trunk/features/aulawiki/modules/mod-workspaces_calendar.php: [FIX] Set calendar title ***: ricks99_away is now known as ricks99 ricks99: @Rodrigo: confirm that your database charset is correct.
i have pt-br pages with no issues Rodrigo: @ricks99: If it was something with the database, shouldn't it affect all pages, not some ? ricks99: did u move some pages? or restore backups?
maybe caching is causing soeme pages to be ok? and others show errors? Rodrigo: Just tried to clean the caches, but the problem remains. ricks99: confirm that your db encoding is correct. what tiki version is this? Rodrigo: I'm using TikiWiki 4.0. I'll check the db encoding right now. ricks99: don't know :( my pt-br pages look fine in 4.x
is it the wiki pages? or the tiki text that is wrong? maybe an encoding issue with the pt-br language file? Rodrigo: The problem affects both the wiki and content strings. I've just edited my '/etc/mysql/my.cnf and set 'default-character-set = utf8', but it got even worse ! Now all pages are messed up ! ***: Wilkins has quit IRC (Read error: 113 (No route to host)) Rodrigo: I mean, both tiki and wiki texts are wrong. ricks99: don't know, sorry. browser issue maybe? or something with the web server? ***: chealer has joined #tikiwiki Rodrigo: I'll try to remove this page and add it again. It is happening with only one page. Coincidentally, it is happening in the only page I have portuguese characters in the page title. But as it belongs to a structure, I could not rename it yet.
Do you know if it is possible to rename a page part of a structure ? When I try to edit it the "rename page" button don't appear at the bottom of the page, as usual. ricks99: odd. i have pages with the pagename in pt-br
y, should b able to rename pages in a structure as usual
confirm that u have the tiki_p_edit structure perm, in addition to the other wiki edit perms Rodrigo: Thanks for your help. I'll make some more tests. Best regards. ***: Rodrigo has quit IRC ("Page closed")
FrankP_german has joined #tikiwiki
timotiCK has joined #TIKIWIKI Tikiwiki|bot: New Forum Posts: calDav with a calendar? - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=35442 ***: timotiCK has left CIA-50: tikiwiki: 03lphuberdeau * r23599 10/trunk/installer/shell.php: [FIX] Can't really explain why it worked without it.
tikiwiki: 03sylvieg * r23600 10/trunk/ (27 files in 13 dirs): [MRG] Automatic merge, branches/4.x 23534 to 23593 ***: FrankP_german has quit IRC ("Nettalk6 - www.ntalk.de")
luminoso has quit IRC ("Leaving") CIA-50: tikiwiki: 03jonnybradley * r23601 10/branches/proposed/lib/setup/twversion.class.php: [MOD] Change version strings (was confusing as 3.2) ***: gozer_ has quit IRC (Read error: 113 (No route to host))
Caarrie is now known as Caarrie|away
luminoso has joined #tikiwiki
luminoso_ has joined #tikiwiki
luminoso has quit IRC (Client Quit)
pascalstjean has joined #tikiwiki
kiilo has quit IRC ("Leaving.")
SEWilco2 has quit IRC (Remote closed the connection)
SEWilco2 has joined #tikiwiki CIA-50: tikiwiki: 03jonnybradley * r23602 10/branches/4.x/templates/tiki-adminusers.tpl: [FIX] Stop "Generate Password" button causing postback. ***: rodrigo_sampaio has quit IRC ("Leaving.")
luminoso_ has quit IRC ("Leaving")
marclaporte has quit IRC (Read error: 104 (Connection reset by peer))
doubleclick has quit IRC (Nick collision from services.)
doubleclic_ has joined #tikiwiki
marclaporte has joined #tikiwiki
ChanServ sets mode: +o marclaporte
nkoth has joined #tikiwiki
luminoso has joined #tikiwiki
RavenC has left
kiilo has joined #tikiwiki
ricks99 has quit IRC ("Get more help: TikiWiki for Smarties http://twbasics.keycontent.org") sylvieg: luciash: btw thank you for all your feedbacks to my messages in devel list CIA-50: tikiwiki: 03alain_desilets * r23603 10/ (4 files in 3 dirs): - Modified watch icon and popup message. sylvieg: :-( this icon was polemic to go in 4.... ***: marclaporte has quit IRC (Read error: 60 (Operation timed out)) luciash: sylvieg: np, thank you, i think others do as well ;)
i am not sure but i suspect these differences between servers can be mysql classic versus mysqli sylvieg: in fat luciash my problem is taht one server return NULL and the other one returns ''
on both the insert NULL goes in error luciash: and both use mysqli ?
ah sylvieg: it is before
in the php code
but theorically you can add a NULL value
it is where I am lost luciash: yes, it sounds weird
default is NULL sylvieg: and phpmyadmin I can not change the default to NULL
so I supects tehre is perhaps a collation or type of table problem luciash: i am no db expert, really, sorry i can't help more than confirmng the bug
*confirming sylvieg: thx anyway - I feel better not to be the only one to be in pain ;-) luciash: maybe insert into `tiki_modules` (name, params) values('dddd', ''); would "fix" it sylvieg: this works on both
but why the NULL is not accepted luciash: maybe NULL can be only default for varchar ? sylvieg: do you want me to do a patch in the code (if $params == NULL) $params = '';
ungly patch
I browse internet ... with no success luciash: yep, at least it would fix it for some
is null and NULL the same ? sylvieg: I think so luciash: maybe it gets converted to lowercase null and it fails then ? sylvieg: no the patch is working - but ... why do I need this patch
why NULL is not accepted
I can also focus why one time is NULL and one time is '' luciash: yes, NULL or not to NULL, that's the question :-D sylvieg: but it is a php version probably luciash: sorry for joking... or pdo versus adodb sylvieg: pdo adodb.. humm not a joke
no both are mysqli and pdo luciash: can you check if the column allows nulls ? ***: nkoth has quit IRC () CIA-50: tikiwiki: 03sylvieg * r23604 10/branches/4.x/ (2 files in 2 dirs): [FIX]tracker: some more configuration for page selector field sylvieg: i can not change in phpmyadmin even if the creation was allowing it luciash: hmm, so you say it shows it doesn't allow nulls ? it was upgrade or fresh install ? sylvieg: fresh luciash: besides it would need probably (if $params === NULL) $params = ''; sylvieg: but why ... the default value should do the trick
after in php we test empty(..) so NULL and ' ' works luciash: could it be some zend lib converting that ? i really don't know, i don't understand why you even cannot change it in db to allow nulls sylvieg: I do not think so - it is a mysql(i?) problem
if I do varchar() default NULL - Why i can not add a NULL value in this column?
why phpMyAdmin is enough smart in the insert panel to transform NULL to '' -: sylvieg is not happy that controversial modifications is committed in tiki4 luciash: in tiki4 ? i thought / means trunk sylvieg: the watch icon ..
next time I will argue more luciash: it went in the branches/4.x again ?
i already rollbacked it once before ;)
now it is your turn, sylvie
and you can, as QT member sylvieg: it is always painful to rollback
each time I have to figure out how to rolback ***: grobda24 has quit IRC ("Leaving") chealer: sylvieg: the tiki.sql query really creates a table with a params columns that can't be NULL. I don't understand why sylvieg: :-)
but default NULL chealer: right sylvieg: how do you fix it chealer: for me the default doesn't show as NULL luciash: sylvieg: oooh, the commit is weird... it commits 3 files in branch and one in trunk :-p sylvieg: me too ***: grobda24 has joined #tikiwiki sylvieg: luciash: you are right good catch luciash: hi chealer chealer: I can run "INSERT INTO `tiki_modulestest` ( name ) VALUES ('dddd');" fine. params takes the value empty string
hi luciash -: sylvieg hopes it would be only one click to roll back - but it is not chealer: (tiki_modulestest having the same structure as tiki_modules) luciash: chealer: but when you try "INSERT INTO `tiki_modulestest` ( name,params ) VALUES ('dddd',NULL);" ? chealer: "If neither NULL nor NOT NULL is specified, the column is treated as though NULL had been specified. "
luciash: didn't try it, but that would presumably fails as sylvieg wrote and according to what phpmyadmin show me
http://dev.mysql.com/doc/refman/5.1/en/create-table.html ***: grobda24 has quit IRC (Remote closed the connection)
grobda24 has joined #tikiwiki CIA-50: tikiwiki: 03sylvieg * r23605 10/branches/4.x/ (3 files in 2 dirs): [FIX]rollback : rollbacj 23603 - too much contreversial sylvieg: I can not figure out how to rollbach in 2 versuions ***: pascalstjean has quit IRC ("ChatZilla 0.9.85 [Firefox 3.5.5/20091102152451]")
grobda24 has quit IRC (Client Quit) CIA-50: tikiwiki: 03sylvieg * r23606 10/trunk/templates/tiki-wiki_topline.tpl: [FIX]rollback : rollback 23603 - too much controversial Tikiwiki|bot: New Forum Posts: NEEDED FOR HIRE UPGRAGE FROM 3.1-4.0 AND FORM - http://tikiwiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=35443 sylvieg: I like cherry picking svn merge -c -xxxx https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk
works pretty nicely ***: chealer has quit IRC (Remote closed the connection)