All times are UTC.
00:11:26 <flo-retina> http://hg.instantbird.org/instantbird/rev/6638610224cb is a strange commit 00:13:59 <flo-retina> http://hg.instantbird.org/instantbird/rev/66d5b093e2e1 "Build system copied from the one of comm-central to build Mozilla from mozilla-central instead of CVS." that feels so looooong ago! 00:16:11 --> Mic has joined #instantbird 00:28:37 <-- chrisccoulson has quit (Ping timeout) 00:28:56 --> chrisccoulson has joined #instantbird 00:55:21 <-- Mic has quit (Quit: Instantbird -- http://www.instantbird.com) 01:00:19 * flo-retina is bored by all these branches 01:04:28 <flo-retina> 13 branches left :-| 01:17:30 <-- ivan has quit (Ping timeout) 01:18:45 --> ivan has joined #instantbird 01:38:10 --> deOmega has joined #instantbird 01:41:33 <-- mrphs has quit (Z:lined (dronebot)) 01:41:40 --> mrphs has joined #instantbird 01:46:40 <-- deOmega has quit (Quit: So easy...but yet complicated.) 02:06:12 <-- Mook_as has quit (Quit: Mook_as) 03:27:30 <-- mrphs has quit (Z:lined (dronebot)) 03:27:37 --> mrphs has joined #instantbird 03:51:55 <-- mrphs has quit (Ping timeout) 04:02:08 --> mrphs has joined #instantbird 04:30:14 --> Mook has joined #instantbird 04:37:40 <-- mrphs has quit (Z:lined (dronebot)) 04:42:54 --> mrphs has joined #instantbird 04:59:59 <-- mrphs has quit (Ping timeout) 05:10:06 --> mrphs has joined #instantbird 05:32:17 <-- clokep has quit (Ping timeout) 06:18:36 <instant-buildbot> build #1610 of macosx-nightly-default is complete: Failure [4failed shell_3] Build details are at http://buildbot.instantbird.org/builders/macosx-nightly-default/builds/1610 06:23:19 <-- mrphs has quit (Z:lined (dronebot)) 06:23:22 --> mrphs has joined #instantbird 07:20:40 <-- Mook has quit (Quit: Mook) 07:23:26 <-- mrphs has quit (Z:lined (dronebot)) 07:23:30 --> mrphs has joined #instantbird 07:33:02 <-- mrphs has quit (Client exited) 07:38:04 --> mrphs has joined #instantbird 07:44:58 <instant-buildbot> build #1228 of win32-nightly-default is complete: Failure [4failed shell_3] Build details are at http://buildbot.instantbird.org/builders/win32-nightly-default/builds/1228 08:10:45 --> hadi has joined #instantbird 08:16:07 --> mconley has joined #instantbird 08:23:16 --> gerard-majax__ has joined #instantbird 08:56:26 <flo-retina> I wrote this in the wrong channel yesterday (was obviously too tired) : 08:56:52 <flo-retina> 03:17:36 - flo-retina: clokep: I've finished handling branches. With all the changes I pushed, the scripts in the repo are now able to generate a file called converted-im.final which is basically what is referred to as "<result of 2.>" in https://etherpad.mozilla.org/im-to-c-c 08:56:53 <flo-retina> 03:28:19 - flo-retina: I've uploaded the converted-im.final file at http://queze.net/goinfre/converted-im.final.gz 08:56:53 <flo-retina> 03:28:47 - flo-retina: if you've got time, please try to use it as described in step 4 of https://etherpad.mozilla.org/im-to-c-c 08:56:53 <flo-retina> 03:29:00 - flo-retina: (and this is not targeted only to clokep ;)) 09:01:20 <-- hadi has quit (Quit: Instantbird 1.5 -- http://www.instantbird.com) 09:17:40 <-- gerard-majax__ has quit (Ping timeout) 09:32:48 <-- EionRobb has quit (Quit: Leaving.) 09:45:57 --> gerard-majax__ has joined #instantbird 09:58:30 --> Even has joined #instantbird 09:58:30 * ChanServ sets mode +o Even 10:10:52 <-- mconley has quit (Input/output error) 10:43:46 <-- Tonnes has quit (Connection reset by peer) 10:45:35 --> Tonnes has joined #instantbird 11:49:21 <-- mrphs has quit (Z:lined (dronebot)) 11:59:27 --> mrphs has joined #instantbird 12:53:02 --> hadi has joined #instantbird 13:23:14 --> GeKo has joined #instantbird 13:45:25 <-- gerard-majax__ has quit (Ping timeout) 13:46:40 --> clokep has joined #instantbird 13:46:41 * ChanServ sets mode +o clokep 13:48:38 <clokep> flo-retina: OK. I'll give it a try soon. 13:52:20 <clokep> (Although I wouldn't mind if someone jumped int o play w/ this. ;)) 13:56:32 <flo-retina> the more people the better 13:56:35 <flo-retina> clokep: hello :) 13:56:43 <clokep> Good morning. 13:58:18 <flo-retina> clokep: so where are we with cleaning the chat/ differences between ib and c-c? 13:58:36 <flo-retina> I think that's the next thing that needs to be finished before we can do a "real" test of the whole thing 13:58:59 <flo-retina> have you started? Should I take it over? 13:59:09 <clokep> flo-retina: We need to check the line endings / encodings of those two files and see which is "correct" and then submit a patch that fixes them to the right repo. 13:59:19 <clokep> I unfortunately didn't have time to look at this at work yesterday. :-\ 13:59:24 <-- GeKo has quit (Z:lined (dronebot)) 13:59:40 --> GeKo has joined #instantbird 14:00:24 <clokep> flo-retina: Do we care which of those #4 solutions I try? 14:00:58 <flo-retina> I think jcranmer prefers the last one 14:01:13 <flo-retina> the first is the only one that I've tested (on a small test repo) 14:01:29 <flo-retina> if we go with the last one, "hg merge -t internal:local or hg merge -t internal:other" needs to be figured out 14:01:51 <flo-retina> I think the second one sucks, so we can forget it I think 14:03:13 --> jb has joined #instantbird 14:04:10 --> igorko has joined #instantbird 14:08:23 <clokep> OK. 14:08:42 --> gerard-majax__ has joined #instantbird 14:15:08 <-- GeekShadow has quit (Ping timeout) 14:15:21 --> GeekShadow has joined #instantbird 14:26:33 <clokep> flo-retina: So...I can't import converted-im.final into a repo, part of the way through the patches start to fail to be applied. 14:26:48 <flo-retina> encoding issue maybe? 14:29:43 <-- BWMerlin has quit (Quit: BWMerlin) 14:34:17 <clokep> Maybe... 14:44:41 <clokep> flo-retina: I added --encoding -utf-8 and it's still failing. :-\ 14:45:18 <flo-retina> where is it failing? 14:54:36 --> Mic has joined #instantbird 14:58:25 <clokep> flo-retina: http://pastebin.instantbird.com/530329 14:58:30 <clokep> I'm not sure if I can get more information or not... 14:58:39 <Mic> Hi 14:58:44 <clokep> http://pastebin.instantbird.com/530330 is my current script btw. 14:59:44 <clokep> Ah, -v adds a lot to that. 14:59:59 --> Huvik has joined #instantbird 15:00:06 <-- Huvik has quit (Quit: Huvik) 15:00:06 <flo-retina> it's not completely clear to me why "purple/purplexpcom/src/facebookOverrideProtocol.js" is included, but I guess that's irrelevant for the current issue :) 15:02:26 <Mic> flo-retina, clokep: should I try that ( http://log.bezut.info/instantbird/today#m40 ) too? 15:03:49 --> iamjayakumars has joined #instantbird 15:04:06 <flo-retina> Mic: if you can help understand what's going wrong, sure :) 15:06:12 <Mic> hmm, at least I could try. Do I need anything but clokep's script and the converted-im.final data? 15:06:37 <flo-retina> hopefully not :) 15:06:40 <clokep> Yes. 15:06:43 <clokep> You need my imported patches. 15:06:45 <flo-retina> well, mercurial obviously, but that was assumed 15:06:46 <clokep> Which are in the bug or... 15:07:02 <flo-retina> clokep: well, that's only needed after the first import succeeds 15:07:25 <clokep> True. :) It should be http://pastebin.instantbird.com/530342 though 15:07:44 --> unghost has joined #instantbird 15:07:53 <clokep> flo-retina: So it looks like it got through to commit b655a0612675 15:08:04 <clokep> Which creates facebookOverrideProtocol.js. 15:08:24 <clokep> Then I guess this fails on the next revision. 15:10:24 <-- Mic has quit (Quit: Instantbird -- http://www.instantbird.com) 15:16:38 <-- clokep has quit (Quit: Instantbird 1.6a1pre -- http://www.instantbird.com) 15:16:46 --> clokep has joined #instantbird 15:16:46 * ChanServ sets mode +o clokep 15:21:39 --> Mic has joined #instantbird 15:22:01 * Mic is now known as Mic-Linux 15:26:07 --> aleth has joined #instantbird 15:26:07 * ChanServ sets mode +h aleth 15:27:33 <-- GeKo has quit (Z:lined (dronebot)) 15:27:47 --> GeKo has joined #instantbird 15:28:50 <-- iamjayakumars has quit (Quit: ) 15:30:04 <-- GeekShadow has quit (Ping timeout) 15:30:16 --> GeekShadow has joined #instantbird 15:38:55 --> FireFly_TB has joined #instantbird 15:42:29 <-- aleth has quit (Ping timeout) 15:56:33 <-- gerard-majax__ has quit (Ping timeout) 15:58:38 <Mic-Linux> My editor complains that there are invalid characters in converted-im.final with its current encoding setting (which is UTF-8). 15:58:53 <-- jb has quit (Ping timeout) 15:59:40 --> aleth has joined #instantbird 15:59:40 * ChanServ sets mode +h aleth 16:00:19 <Mic-Linux> Ah, I saw it in the logs. Sorry. 16:08:41 --> josefec has joined #instantbird 16:13:59 <Mic-Linux> flo-retina, clokep: could it be that this involves a problem with branches? 16:14:18 <Mic-Linux> I've looked at the file where it fails and searched for the changes to it. 16:14:36 <Mic-Linux> Here's what searching in converted-im.final turned up: http://pastebin.instantbird.com/530403 16:24:22 <-- igorko has quit (Quit: Instantbird 1.5 -- http://www.instantbird.com) 16:27:26 <-- josefec has quit (Quit: Instantbird 1.4 -- http://www.instantbird.com) 16:27:44 --> josefec has joined #instantbird 16:28:45 --> iamjayakumars has joined #instantbird 16:30:45 <-- josefec has quit (Quit: Instantbird 1.5 -- http://www.instantbird.com) 16:39:58 <flo-retina> clokep: arg, I guess that means the hg export/hg import strategy doesn't work when there are branches :( 16:40:10 <flo-retina> hmm, that was for Mic-Linux 16:40:59 <flo-retina> Mic-Linux: hmm, I would expect that file to be valid UTF8 :-S 16:41:19 * aleth wonders what bug in https://mxr.mozilla.org/comm-central/source/mail/components/im/content/imbuddytooltip.xml#149 16:41:54 <clokep> flo-retina: I doubt that'll support branches. :-\ 16:41:59 <clokep> Are we exporting just to change commit messages? 16:42:13 <flo-retina> aleth: that code doesn't exist any more with the new tooltips, right? 16:42:17 <flo-retina> clokep: yes 16:43:35 <clokep> Hmmm..... 16:44:02 <aleth> flo-retina: Right :) 16:44:41 <clokep> Maybe histedit then? 16:44:43 <flo-retina> clokep: I guess I'm going to look at hg histedit 16:44:47 <flo-retina> ahah :) 16:44:48 * aleth wants that file unforked just to cut down on future headaches reviewing merges 16:44:59 <aleth> But I don't think I can ask Paenglab to do that. 16:44:59 <Mic-Linux> flo-retina: what did you do to create the exported file? 16:45:04 <flo-retina> aleth: there won't be any more merges ;) 16:45:29 <aleth> flo-retina: There will be between those two files unless they are unforked ;) 16:45:33 <flo-retina> Mic-Linux: http://hg.instantbird.org/bio-merge/file/20a03d9648d8/im-in-c-c/Makefile#l28 16:45:49 <aleth> (buddytooltip.xml/imbuddytooltip.xml) 16:45:54 <flo-retina> aleth: it's different when we remember what we are changing ;) 16:46:16 <flo-retina> the pain with merges is in large parts because we don't remember what we were doing when changing the ib file 16:46:30 <Mic-Linux> Might 0::tip instead of 0:tip help here? http://hg.instantbird.org/bio-merge/file/20a03d9648d8/im-in-c-c/Makefile#l6 16:47:08 <aleth> All I'm saying is that this "trivial" review is costing way too much time :-/ 16:47:52 <flo-retina> Mic-Linux: that rule is dead code 16:48:45 <Mic-Linux> Oops, I see. Thanks :) 16:48:48 <flo-retina> Mic-Linux: well, not fully dead, but it's used only to prepare the run of renames.js, which purpose is only to generate this list: http://hg.instantbird.org/bio-merge/file/20a03d9648d8/im-in-c-c/filemap#l29 16:49:04 <-- FireFly_TB has quit (Ping timeout) 17:13:21 --> gerard-majax__ has joined #instantbird 17:15:08 <clokep> Running a diff between ib/chat and cc/chat shows no differences on this machine. :-S 17:22:30 * clokep doesn't understand. :-\ 17:23:07 --> dionisos has joined #instantbird 17:23:24 <clokep> flo-retina: So both those files have crlf line endings...but on my machine they have thatin BOTH repos. 17:27:21 --> mconley has joined #instantbird 17:33:05 <-- dionisos has quit (Ping timeout) 17:51:52 --> wnayes has joined #instantbird 17:55:03 <-- Mic-Linux has quit (Quit: Instantbird 1.6a1pre -- http://www.instantbird.com) 17:59:55 <aleth> buddy.loggedIn doesn't seem to be set anywhere? 18:00:15 <flo-retina> possibly dead code 18:00:30 <flo-retina> I think if/when it worked, it was AIM specific 18:01:06 <aleth> OK, that explains it. 18:03:14 --> mib_ob1tw0 has joined #instantbird 18:03:31 <aleth> Gah, now BMO is down just when I've finished the review? :P 18:03:51 <-- mib_ob1tw0 has quit (Quit: http://www.mibbit.com ajax IRC Client) 18:04:07 <flo-retina> aleth: the email said "There will be a period of 30 minutes when bugzilla.mozilla.org will be offline." 18:04:23 <flo-retina> that half hour started an hour ago :-S 18:04:31 * aleth did not get that email 18:04:39 <flo-retina> it was sent to all@moco 18:05:03 <flo-retina> and I would expect it was also sent to some mailing list like dev.tree-management, or dev.planning or something 18:11:49 <-- flo-retina has quit (Ping timeout) 18:12:57 --> flo-retina has joined #instantbird 18:12:57 * ChanServ sets mode +qo flo-retina flo-retina 18:22:28 <-- mconley has quit (Ping timeout) 18:22:46 --> mconley has joined #instantbird 18:35:44 --> jb has joined #instantbird 18:38:11 <-- jb has quit (Ping timeout) 18:40:12 --> dionisos has joined #instantbird 18:41:34 <flo-retina> so, histedit fails with "abort: cannot edit history that would orphan nodes" 18:47:29 --> jb has joined #instantbird 18:49:07 <flo-retina> googling around gives me http://bz.selenic.com/show_bug.cgi?id=4021 18:50:10 <aleth> ...and the evolve extension is "experimental" :-/ 18:50:13 <flo-retina> at this point it seems the least crappy 'solution' is http://stackoverflow.com/a/8341857 (ie hack the code of the hg convert extension, to change our commit messages directly during the repo conversion) 18:52:00 <-- jb has quit (Ping timeout) 18:54:24 <flo-retina> another idea I had was to "hg bundle" and the edit the commit messages in that file, but it looks like even uncompressed bundles are binary files :( 18:57:13 <-- iamjayakumars has quit (Quit: ) 19:03:15 <-- aleth has quit (Ping timeout) 19:15:06 <flo-retina> ok, editting hg convert directly works 19:15:15 <flo-retina> I guess now I need to rewrite my JS in python :-S 19:25:50 <clokep> That should be pretty easy. :) 19:26:02 <flo-retina> want to help with that? 19:26:22 <flo-retina> the last time I really wrote some python was when handling l10n of libpurple files (ie a looong time ago) 19:27:03 <flo-retina> clokep: the part I still need to rewrite is: http://pastebin.instantbird.com/530659 19:27:38 <clokep> map.js is JSON? 19:27:51 <flo-retina> map.js is a js file wrapping map.json which is json 19:28:05 <flo-retina> I don't mind putting the JSON string directly inside the file to avoid writing file I/O code :) 19:29:16 <flo-retina> looks like |import json| and |map = json.loads(' long string ')| should do 19:31:43 <clokep> I'm rewriting the bottom part, one second. 19:31:57 <-- mconley has quit (Input/output error) 19:31:59 <flo-retina> cool 19:32:17 <clokep> Idk if it'll work, but hey. ;) 19:35:00 <flo-retina> "map" will contain directly the object with the bug number map (ie ignore the "bugMap" that's in the JS code) 19:36:25 * clokep is trying to figure out what "prefix" is.... 19:36:36 <flo-retina> where? 19:36:45 <clokep> In the regexp function. 19:36:49 <flo-retina> prefix is either "Bug" or "bug" 19:36:58 <flo-retina> or Bug# or bug# 19:37:12 <flo-retina> (but I don't think we have the # in commit messages; it was only there for the BIO migration I guess) 19:37:13 <clokep> And match is the entire string, right? 19:37:31 <flo-retina> yeah, match is the whole original string 19:38:01 <clokep> flo-retina: http://pastebin.instantbird.com/530660 I think that'll do it. 19:38:24 <clokep> Oops, http://pastebin.instantbird.com/530661 19:38:26 <clokep> I deleted an extra line. :) 19:38:36 <flo-retina> that "extra" line looks useful ;) 19:40:42 <clokep> Oops. :-D 19:40:50 <flo-retina> how are you making it case insensitive? 19:41:08 <clokep> I'm most likely not. :-D 19:41:46 <clokep> flo-retina: Add a flags=re.IGNORECASE parameter at the end of the sub call. 19:42:59 <-- mrphs has quit (Ping timeout) 19:43:21 <flo-retina> I added "import re" to help it a bit 19:43:24 <flo-retina> but it still fails 19:43:25 <flo-retina> KeyError: '749930' 19:43:43 <flo-retina> bugId = map[number] 19:43:43 <flo-retina> is the unhappy line 19:43:50 --> mrphs has joined #instantbird 19:45:21 <flo-retina> fixed 19:45:24 <flo-retina> it now fails with "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 30: ordinal not in range(128)" 19:48:40 <clokep> Add a u in front of one of the strings to make it unicode? 19:49:34 <flo-retina> the unhappiness is caused by these 3 commit messages: 19:49:34 <flo-retina> Bug 294 - Also disable the 'Show Logsâ¦' tab context menuitem when there's no log for the conversation. 19:49:35 <flo-retina> Bug 294 - Disable the 'Show Logsâ¦' context menuitem when there's no log for the target buddy/contact. 19:49:35 <flo-retina> Bug 2251 - Accounts stuck in the "Connectingâ¦" state, r=florian,clokep. 19:49:36 <instantbot> Bug https://bugzilla.instantbird.org/show_bug.cgi?id=294 min, --, 1.0, florian, RESO FIXED, Handle the case where no logs are available 19:49:37 <instantbot> Bug https://bugzilla.instantbird.org/show_bug.cgi?id=2251 maj, --, 1.5, aleth, RESO FIXED, Accounts stuck in the "Connectingâ¦" state 19:49:49 <flo-retina> ie by the â¦ character 19:52:00 <clokep> :-\ 19:52:40 <flo-retina> why is unicode still so painful in 2014? :( 19:54:37 <flo-retina> desc = re.sub(r"(bug\s#?)(\d+)", replacer, desc.decode('utf-8'), flags=re.IGNORECASE).encode('utf-8') 19:54:37 <flo-retina> seems to fix it 19:57:45 <clokep> (o_O) WTF. 19:58:22 <-- dionisos has quit (Ping timeout) 19:59:46 <flo-retina> clokep: http://queze.net/goinfre/convert-im.final.bundle 20:01:37 <clokep> flo-retina: :) 20:02:01 <flo-retina> so if I understood correctly, I need to look into these line ending issues? 20:02:12 <clokep> I'd appreciate it if someone on non-windows could look. 20:02:16 <clokep> I don't trust Windows... 20:03:12 * flo-retina has heard something about a macbook :-] 20:03:22 <clokep> I don't have IB stuff on it yet. 20:03:26 <clokep> Or Mercurial, etc. 20:05:17 <flo-retina> fair enough 20:05:34 <flo-retina> so what's our ETA for finishing all this stuff? 20:06:19 <flo-retina> the tree being closed doesn't help I guess 20:06:27 <clokep> Working on it now. ;) 20:07:02 <flo-retina> I'm going to ignore the p= stuff in commit messages 20:07:08 <flo-retina> too tedious to do :) 20:08:22 <flo-retina> I've put an updated todo list at the end of the pad 20:08:26 <flo-retina> is there anything I'm missing? 20:08:35 <flo-retina> hmm, maybe check that your patches apply above that bundle? 20:08:50 * flo-retina isn't exactly sure of the command to do that 20:08:51 <clokep> That's what I'm doing now. ;) 20:09:04 <flo-retina> :) 20:09:24 <flo-retina> it looks like we are pretty close 20:09:54 <flo-retina> unless another unexpected annoyance like hg export/import AND histedit disliking branches appears :-| 20:13:29 --> EionRobb has joined #instantbird 20:20:09 <clokep> flo-retina: My patches apply. :) 20:25:57 <clokep> I think my script works... 20:34:05 <clokep> flo-retina: Will they be OK w/ us adding 9 heads to c-c? :-\ 20:34:13 <clokep> One of which will go away when we merge, I suppose. 20:36:24 <-- mrphs has quit (Z:lined (dronebot)) 20:36:28 --> mrphs has joined #instantbird 20:37:34 <clokep> flo-retina: So what should I do w/ this when I get it working? 20:37:36 <clokep> Push to bitbucket? 20:41:52 <clokep> flo-retina: OK, it works fine... 20:47:21 --> mconley has joined #instantbird 20:56:44 <-- mrphs has quit (Z:lined (dronebot)) 20:56:49 --> mrphs has joined #instantbird 21:03:00 * clokep can't push his script to bio-merge anymore. :-S 21:08:11 <clokep> My current script: http://pastebin.instantbird.com/530726 and the differences at the end: http://pastebin.instantbird.com/530727 21:08:26 <clokep> I can push the repo somewhere or give bundles out. 21:14:08 <flo-retina> clokep: "can't push his script to bio-merge anymore." why? 21:14:41 <flo-retina> "9 heads" arg :( 21:14:56 <flo-retina> the "hg export" was stripping pointless heads before 21:17:23 <-- mrphs has quit (Z:lined (dronebot)) 21:17:31 --> mrphs has joined #instantbird 21:19:57 <flo-retina> received 13 minutes ago an email saying trees are reopened 21:27:11 <clokep> flo-retina: 500 error 21:27:24 <flo-retina> :-S 21:27:35 <flo-retina> I guess I should fix that 21:27:44 <flo-retina> I'm pushing first something to fix the 9 heads 21:27:48 <flo-retina> it's easy :) 21:27:53 <clokep> :) 21:31:44 <-- GeKo has quit (Quit: leaving) 21:32:15 <flo-retina> clokep: is there an error message with the error 500? 21:33:07 <clokep> flo-retina: http://pastebin.instantbird.com/530748 21:33:39 <flo-retina> is this a local or remote error? "failed to import extension hggit from ~/hg-git/hggit: No module named du 21:33:39 <flo-retina> lwich.errors" 21:34:22 <flo-retina> ah, nevermind, I found the issue 21:35:12 <flo-retina> clokep: you should be able to push now 21:36:36 <clokep> flo-retina: Did it. :) 21:36:42 <clokep> That's a local error. 21:36:57 <clokep> hg-git only works via Windows for me not via Mozillabuild 21:41:38 <clokep> flo-retina: So I'm leaving for a bit (I'm going out). What's left to do? (I.e. should I bring my computer for when I get to my friends in a couple of hours? :P) 21:42:50 <flo-retina> I was going to ask you almost the same question: what's left to do? :-P 21:43:27 --> mconley_ has joined #instantbird 21:43:44 <-- mconley has quit (Connection reset by peer) 21:43:57 --> mconley has joined #instantbird 21:44:03 <clokep> flo-retina: I think have people look over the converted repo? 21:44:10 <flo-retina> is im-on-cc.final available somewhere? 21:44:11 <clokep> (Which means I need a new converted bundle and then I can run my script. 21:44:14 <clokep> ) 21:44:20 <clokep> flo-retina: I can push it to the repo? 21:44:25 <flo-retina> sure 21:44:40 <flo-retina> do we need to resolve the chat/ differences now? 21:44:49 <clokep> I think so. 21:44:57 <flo-retina> how much work is that? 21:45:07 <-- mconley_ has quit (Ping timeout) 21:45:24 <flo-retina> looks like the "Avoid bustage." changes need to go to the Ib repo 21:45:41 <flo-retina> the socket.jsm change too 21:45:45 <flo-retina> for the others, I'm not sure 21:45:56 <clokep> That one commit has to land on c-c. 21:45:57 <flo-retina> (we need to find which of c-c/ib is broken) 21:46:01 <clokep> And then we have the line endings different? 21:46:07 <clokep> socket.jsm changes? What? 21:46:18 <flo-retina> "That one commit has to land on c-c." what? 21:46:27 <-- gerard-majax__ has quit (Ping timeout) 21:46:30 <flo-retina> clokep: see line 85 of http://pastebin.instantbird.com/530727 21:47:24 <clokep> Oh, interesting. 21:49:04 <flo-retina> I'm about to push the tooltip patch (unless you are about to do it) 21:49:21 <clokep> I am about to leave. 21:49:25 * clokep is packing his back pack. 21:51:31 <clokep> I'd appreciate if you could look at the line endings one at least? 21:52:56 <flo-retina> so can I push the encoding/line ending fixes with r=you? :-P 21:53:13 <-- clokep has quit (Ping timeout) 22:06:39 <flo-retina> interestingly, the broken line endings are on the ib side 22:06:48 <flo-retina> the broken encoding is on the Tb side though 22:30:14 <-- mconley has quit (Input/output error) 22:36:57 --> clokep_wp8 has joined #instantbird 22:37:33 <clokep_wp8> flo-retina: Yes. That's what i suspected about the line endings btw. 22:37:34 <flo-retina> clokep_wp8: the Ib/c-c differences in chat/ are all fixed 22:37:36 <-- clokep_wp8 has quit (Connection reset by peer) 22:38:14 * flo-retina hopes clokep isn't tapping his phone while driving 22:44:16 <instantbot> Check-in: http://hg.instantbird.org/instantbird/rev/1d0601149149 - Aryeh Gregor - Bug 780618 - Fix broken nsNetError.h references in comm-central; r=mconley 22:44:17 <instantbot> Check-in: http://hg.instantbird.org/instantbird/rev/33f2ab32ed82 - Mihnea Dobrescu-Balaur - Bug 905822 - Annotate manifests with run-sequentially. r=jcranmer, a=me 22:44:18 <instantbot> Check-in: http://hg.instantbird.org/instantbird/rev/eb98b07dd78a - Florian Quèze - Fix line endings in chat/protocols/yahoo/test/test_yahooAccount.js and chat/locales/en-US/contacts.properties. 22:44:19 <instantbot> Check-in: http://hg.instantbird.org/instantbird/rev/911c3d1364fb - Florian Quèze - Bug 920801 - Port chat/ changes from Instantbird to comm-central - 6 - Bio 1982 - Create Yahoo! Messenger Protocol Plug-In, r=clokep. 22:52:54 <flo-retina> there's a problem with the merge script, we overwrite all the list of comm-central tags with a file containing only a "0.1.1" tag for im/ 23:02:13 <flo-retina> fixed :) 23:04:23 <-- Even has quit (Input/output error) 23:05:59 <flo-retina> I'll need to remember to remove my patch to hg convert after we are done with this :) 23:09:55 <flo-retina> clokep: what are we going to do with https://bugzilla.mozilla.org/show_bug.cgi?id=955697 ? (it's unfortunate that we didn't finish it before starting this im/ merge; would have been a little bit cleaner... oh well :-|) 23:35:37 <flo-retina> I pushed our stuff to try at https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=1d7aa08cb2d7 23:54:28 <-- nathanr has quit (Ping timeout) 23:55:04 --> nathanr has joined #instantbird