| ../irclogs/#mantishelp.2009-06-15.log | ||
| --- scribe started --- | 06:29 | |
| --- scribe started --- | 08:00 | |
| nuclear_eclipse | morning all | 12:31 |
|---|---|---|
| nuclear_eclipse | paul_: there? | 12:31 |
| [KK]Kirill | lo | 12:31 |
| paul_ | nuclear_eclipse: JOHN!!!!!!!!!!!!!!!!!!!! | 12:38 |
| paul_ | nuclear_eclipse: I need to push my branch ;/ | 12:38 |
| [KK]Kirill | >:D | 12:38 |
| paul_ | it's getting long | 12:38 |
| [KK]Kirill | hi Paul | 12:38 |
| paul_ | lo | 12:38 |
| nuclear_eclipse | paul_: it's generally best to keep multiple branches for each topic, specifically for this reason..... | 12:38 |
| paul_ | I do | 12:39 |
| paul_ | :) | 12:39 |
| paul_ | dates+bugobjects were seperate branches | 12:39 |
| paul_ | I merged bugobjects into my 'trunk' as I was going to push on saturday | 12:39 |
| nuclear_eclipse | so did you ever mail the dev list about bugobjects like Victor asked/wanted you to? | 12:41 |
| paul_ | nope | 12:42 |
| paul_ | my server broke on sunday | 12:42 |
| paul_ | until this morning | 12:42 |
| nuclear_eclipse | wyh didn't you mail the dev list on thursday/friday when he first asked you? | 12:42 |
| paul_ | he asked on saturday didn't he | 12:42 |
| nuclear_eclipse | no, he asked during the week, because I was at work when he did | 12:43 |
| paul_ | I guess people could check out the branch | 12:46 |
| paul_ | it's got graphs work in it too | 12:46 |
| nuclear_eclipse | *that's* why you should be keeping separate branches, paul | 12:46 |
| paul_ | I was | 12:46 |
| paul_ | until the point people said commit bugojects ;p | 12:46 |
| nuclear_eclipse | you shouldn't just be heaping all your work onto one branch and expect someone to be able to review a single part of it... | 12:47 |
| paul_ | well 2 months ago is when bugobjects branch first came to light | 12:48 |
| nuclear_eclipse | I'm not arguing that | 12:49 |
| nuclear_eclipse | I'm simply wanting to get 1.2rc out, and apparently Victor wants you to mail the dev list about bugobjects before you do anything more with it, so please do that ASAP, or I'll just release the Rc without it... | 12:50 |
| paul_ | more importantly | 12:53 |
| paul_ | I think we hsould do a 1.1 release | 12:54 |
| nuclear_eclipse | what do you mean? | 12:54 |
| paul_ | I found a bug in a 2005 security fix at the weekend :) | 12:54 |
| nuclear_eclipse | why does that matter? | 12:55 |
| nuclear_eclipse | just fix it in master, and leave 1.1 alone | 12:55 |
| paul_ | it could be a security issue though no? | 12:55 |
| nuclear_eclipse | I don't know, it depends on what the bug is; but tbh, that the bug has been there since 2005 tells me that it's *really* not that important that we should make yet another 1.1 release.... | 12:56 |
| paul_ | I agree | 12:56 |
| paul_ | that and the fact I've rewritten the broken code | 12:58 |
| paul_ | so it's not immediately obvious | 12:59 |
| mantisbot | New bug: Bug 10590 - vpennel - open - new | 13:06 |
| mantisbot | New bug: Probleme on date custom field update - http://www.mantisbt.org/bugs/view.php?id=10590 | 13:06 |
| paul_ | nuclear_eclipse: i've *almost* finished phpdoc+db_query removal too | 13:06 |
| * paul_ was bored over weekend | 13:06 | |
| mantisbot | New bug: Bug 10591 - vpennel - open - new | 13:11 |
| mantisbot | New bug: File custom field - http://www.mantisbt.org/bugs/view.php?id=10591 | 13:11 |
| CIA-61 | Mantisbt: jreese * re345f2f865d7 / (54 files in 5 dirs): Fix #10303: Use UTF-8 compatible string functions. | 13:57 |
| CIA-61 | Mantisbt: jreese * r4fe8e0277fc7 /library/utf8/ (86 files in 12 dirs): Issue #10303: Added phputf8 0.5 package. | 13:58 |
| [KK]Kirill | bug 10303 | 14:29 |
| mantisbot | Bug 10303 - jreese - fixed - resolved | 14:29 |
| mantisbot | Create and use string_api wrappers for multibyte string functions - http://www.mantisbt.org/bugs/view.php?id=10303 | 14:29 |
| mantisbot | New bug: Bug 10592 - cbasset - open - new | 15:01 |
| mantisbot | New bug: mc_enum functions doesn't take customization into account - http://www.mantisbt.org/bugs/view.php?id=10592 | 15:01 |
| paul_ | nuclear_eclipse: *sighs* | 15:11 |
| paul_ | can you pull that commit? | 15:11 |
| nuclear_eclipse | what commit? | 15:11 |
| paul_ | 15:07 < CIA-61> Mantisbt: jreese * re345f2f865d7 / (54 files in 5 dirs): Fix #10303: Use UTF-8 compatible string functions. | 15:12 |
| paul_ | 15:07 < CIA-61> Mantisbt: jreese * r4fe8e0277fc7 /library/utf8/ (86 files in 12 dirs): Issue #10303: Added phputf8 0.5 package. | 15:12 |
| nuclear_eclipse | what do you mean by pull it? | 15:12 |
| paul_ | not include it in for now | 15:12 |
| nuclear_eclipse | why? | 15:12 |
| paul_ | for the reasons i've said last few days | 15:12 |
| paul_ | besides that commit will probably break my local branch completely | 15:12 |
| nuclear_eclipse | paul_: if you would have listened to me the past few days, I've told you that we can bo back and fix any of the concerns you have with that implementation | 15:13 |
| nuclear_eclipse | and it really shouldn't be that difficult to fix any merge conflicts -- I really don't think it's worth reverting over that | 15:13 |
| paul_ | the point is that's not going to merge in anyway cleanly with what i've done over weekend | 15:13 |
| nuclear_eclipse | so fix any conflicts | 15:14 |
| paul_ | lol | 15:14 |
| nuclear_eclipse | and you still haven't mailed the dev list like victor asked you to.... | 15:16 |
| * paul_ isn't mailing from his work mail address | 15:16 | |
| nuclear_eclipse | so use your mantisforge address... | 15:16 |
| nuclear_eclipse | didn't you set up webmail and all that? | 15:16 |
| paul_ | yep although the real reason is i need to sync my mantisforge branch | 15:16 |
| paul_ | but seriously | 15:18 |
| paul_ | my first aim is to drop that library | 15:18 |
| nuclear_eclipse | paul_: please, ignore the utf8 stuff right now | 15:19 |
| paul_ | guess I can work on replacing those library functions with the versions i've worked out over the last month or so tonight ;/ | 15:19 |
| nuclear_eclipse | and for the love of god, don't drop the library -- we *really* can't just reinvent the wheel every damn time we come across some new topic... | 15:20 |
| nuclear_eclipse | and seriously, I did some testing on my server, and there was literally *no* performance difference between with or without the new utf8 stuff, so like I said, the performance of an individual function is *really* not important | 15:21 |
| paul_ | the point still remains that the library isn't being updated and we've already done work on supporting php5,5.3 and 6 with unicode for functions | 15:28 |
| nuclear_eclipse | the point still remains that by rolling our own library, we will still not have anything manitained! | 15:29 |
| nuclear_eclipse | and seriously, we can modify the existing library as it is if we really need to | 15:30 |
| nuclear_eclipse | and PHP6 still isn't even in any sort of stable state yet! | 15:30 |
| * paul_ gets home | 17:22 | |
| paul_ | and going out for dinner tonight ;/ | 17:22 |
| paul_ | 18:32 * paul_ gets home | 17:23 |
| paul_ | 18:32 < paul_> and going out for dinner tonight ;/ | 17:23 |
| paul_ | will you be about in a few hours john? | 17:23 |
| nuclear_eclipse | yep | 17:35 |
| paul_ | cool | 17:35 |
| paul_ | you can work out how to merge my branch then ;p | 17:36 |
| nuclear_eclipse | dhx_m: around? | 18:00 |
| siebrand | cool. Someone just finished the Czech localisation. | 18:26 |
| nuclear_eclipse | :) | 18:26 |
| paul_ | nuclear_eclipse: around | 19:58 |
| nuclear_eclipse | yo | 20:04 |
| * siebrand burps softly. | 20:07 | |
| nuclear_eclipse | hi siebrand | 20:07 |
| siebrand | hola | 20:07 |
| paul_ | nuclear_eclipse: so, how do i merge this branch | 20:27 |
| nuclear_eclipse | `git pull --rebase` -- if there are conflicts, fix the files that have conflicted, `git add <file>` and `git rebase --continue` | 20:29 |
| paul_ | is there a way to avoid that step | 20:30 |
| nuclear_eclipse | which step? | 20:30 |
| paul_ | ix the files that have conflicted, `git add <file>` | 20:30 |
| nuclear_eclipse | well, if there are conflicts, no, you can't skip that step.... | 20:30 |
| paul_ | can we pick out the two utf8 commits | 20:30 |
| paul_ | then apply them afterwards | 20:30 |
| nuclear_eclipse | that will create just as many, if not more conflicts.... | 20:31 |
| paul_ | erm nope | 20:31 |
| nuclear_eclipse | erm, yep | 20:31 |
| nuclear_eclipse | trust me | 20:31 |
| paul_ | trust me it won't :) | 20:31 |
| nuclear_eclipse | paul_: if they conflict applying your changes on top of utf8, applying utf8 on top of your commit will (guaranteed) cause as many or more conflicts as | 20:32 |
| paul_ | one's mainly a string replace though... | 20:32 |
| nuclear_eclipse | it's just the way that mergeing works... | 20:32 |
| nuclear_eclipse | paul_: if you really don't want to deal with it, push it to a public branch, and I'll take some time to resolve any merge conflicts... | 20:43 |
| paul_ | I dont mind doing it | 20:51 |
| paul_ | what I just need is victor to agree to push changes | 20:51 |
| paul_ | nuclear_eclipse: branch is at http://git.mantisforge.org/w/mantisbt/paul.git?a=shortlog;h=refs/heads/15June but I'll sort out utf8 | 20:53 |
| * paul_ just needs rest of stuff agreed :P | 20:53 | |
| nuclear_eclipse | paul_: just email that link, and a link of the diff between master and your branch to the dev list, and I'll prod people to review it asap for the RC | 20:54 |
| paul_ | you've not looked at it ;p | 20:54 |
| nuclear_eclipse | I have, it's just a shortlog, which makes it hard to tell what's from master and what's from your branch... | 20:59 |
| paul_ | 3 days agoJohn ReeseMerge commit 'dhx/rm-hardcoded-enum' into enumscommit (base | diff) | commitdiff | tree (base | diff) | | 21:00 |
| paul_ | above that is the branch | 21:00 |
| nuclear_eclipse | ok | 21:00 |
| paul_ | http://git.mantisforge.org/w/mantisbt/paul.git?a=commitdiff;h=27213a2080fe6e1dd6e7bbcd3dbaeda6684690b1;hp=16677b02600202b5ebbb3fff9fe0d5c445bffa62 is the patch of the changes in branch to master | 21:00 |
| nuclear_eclipse | ok, so mail both those links to the list | 21:04 |
| paul_ | btw, did you look at the graphs changes? | 21:15 |
| nuclear_eclipse | not yet | 21:15 |
| paul_ | you've concluded however that I got bored over the weekend? | 21:16 |
| nuclear_eclipse | it is noticeable... | 21:16 |
| paul_ | i've almost finished phpdoc warnings for /core! | 21:17 |
| nuclear_eclipse | time to head home | 21:19 |
| nuclear_eclipse | paul_: send that mail to dev list... | 21:19 |
| paul_ | ok!ok! | 21:19 |
| paul_ | just finishing phpdoc first | 21:20 |
| paul_ | also we need to discuss php codesniffer rules | 21:20 |
| nuclear_eclipse | well, that should be yet another post to the dev list... | 21:20 |
| * nuclear_eclipse leaves | 21:20 | |
| phl4kx | hi all | 23:16 |
| phl4kx | what option I have to activate for send email to a INFORMATED when I change a status bug to a RESOLVED? | 23:17 |
| nuclear_eclipse | look at $g_notify_flags and $g_default_notify_flags -- both of which are also canfigurable through the configuration management UI | 23:21 |
| phl4kx | yes I see thanks | 23:25 |
Generated by irclog2html.py