[12:18] Maybe one of the big challenges of Launchpad is achieving something lovable, while we need to something so broad. Lovable needs depth, and we cannot really go as deep as we would wish... === jml [n=jml@ppp105-240.lns1.hba1.internode.on.net] has joined #launchpad === flacoste [n=francis@modemcable207.210-200-24.mc.videotron.ca] has left #launchpad ["Bye"] === belito [n=user@190.40.25.240] has joined #launchpad === mdz [n=mdz@george.kkhotels.co.uk] has joined #launchpad === jml_ [n=jml@ppp105-240.lns1.hba1.internode.on.net] has joined #launchpad [01:13] the dep on gnarly is gone now right ? === jml_ is now known as jml === ryanakca [n=ryan@unaffiliated/ryanakca] has joined #launchpad === mholthaus_ [n=mholthau@johnny33.dersbach.ch] has joined #launchpad === ckdake [n=ckdake@gallery/ckdake] has joined #launchpad === highvoltage [n=jonathan@196.1.61.12] has joined #launchpad [02:08] anyone around that can answer a few questions about putting a new project into rosetta? [02:28] ckdake: I probably can't, but go ahead and we'll see how far I get. Someone else can pick up the pieces :) [02:28] I'm the project manager for Gallery, and we've been looking at rosetta as a possibility to manage translations [02:29] we want to allow translators to continue submitting things they way they currently do, which it sounds like rosetta can play nicely with [02:29] and we have a makefile target that needs to be run to update the compiled translation files when new pos come in [02:30] I was curious about how rosetta can tie in to our svn and if there would be a way to run makefile things before commits from rosetta [02:30] Afaik, you can (periodically) get an export of the .mo's from rosetta [02:31] which you would do, say, prior to release [02:31] not sure about continously syncing [02:31] the main reason for it is that most of our translators like to be able to test out how their translation works immediately after doing it === LarstiQ notes he has only translated a couple of things in the webinterface, and got the blender tarball once, nothing more [02:32] right now they can just run make, but having to wait for a release would be less than ideal [02:32] ckdake: ah well, people could still work directly on a .po === LarstiQ s/.mo/.po/ a couple of sentences back [02:33] ckdake: you're probably better off asking someone in the know like jordi/carlos/danilos, or mailing launchpad-users === LarstiQ has too much chance of confusing the issue, sorry [02:33] heh. ok. thanks for trying! === jsgotangco [n=jsg123@ubuntu/member/jsgotangco] has joined #launchpad [03:10] WOO WOO WOO [03:10] guns don't kill PQM [03:10] I DO! [03:19] kiko-zzz: for the win === wasabi [n=wasabi@ubuntu/member/wasabi] has joined #launchpad [03:42] So, has anybody thought of hosting virtual machines through launchpad? [03:42] Odd idea I know, just thought of it. [03:42] YOu'd have some "machine" launchpad structure, a lot like you do with bzr branches. [03:42] It'd run Xen someplace. [03:43] You could group machines togehter... assign permisions for people to send signals to reboot, or get a console. [03:43] Just throwing it out there. Later. :) === wasabi [n=wasabi@ubuntu/member/wasabi] has left #launchpad ["Ex-Chat"] [03:44] meep [03:44] hehe [03:45] something is whack with the branch mirror === stub [n=stub@ppp-58.8.14.92.revip2.asianet.co.th] has joined #launchpad [05:00] wheres the 'getting started developing lp' wiki pages these days ? [05:03] lifeless: we don't have a single up-to-date set of instructions at the moment [05:03] hmm [05:03] that was really useful. I think it would be a good idea to pull that back together [05:03] we're hiring sufficiently fast its worth it IMO [05:04] the DatabaseSetup page is pretty up to date as far as getting Postgres configured locally === bradb [n=bradb@modemcable077.58-130-66.mc.videotron.ca] has left #launchpad [] [05:04] ya, my pgsql is fine AFAIK [05:04] I walked _thumper_ through some of the initial setup manually [05:05] It's a bit odd that some info is on the wiki, and some (doc/localdomain-setup.txt) is only in the source tree. [05:05] spiv: ... and its out of date [05:05] yay static doc [05:06] jamesh: it's documentation, of course it's out of date ;) [05:08] I should see how my "bzr repo-push" plugin performs with smart server [05:11] lifeless: "sufficiently fast" wouldn't be my choice of words :P [05:15] jamesh: have you taken a look at the pygettextpo breakage carlos reported on the list? [05:16] Gooooooooooooooooooooooooooooooooood afternoon Launchpadders! [05:16] spiv: was going to investigate that. Hopefully we can use an #ifdef to make it function for both versions [05:17] jml: blue proseth [05:18] lifeless: what's a proseth? [05:18] jamesh: I hope so. I took a brief stab at it, and it reminded me how terribly rusty my C is... [05:19] jamesh: so you're probably the best person to fix it, assuming you have time. [05:19] 'due process' [05:24] lifeless: the problem with such processes is you can't figure in advance out how long they take to run. [05:24] thats why we call them 'due' [05:24] rather than 'overdue' [05:24] :) [05:27] What the hell? [05:27] I have to register my times of presence at a sprint in UTC?? [05:31] mpt: bug 65868 [05:31] Malone bug 65868 in launchpad "Sprint attendance times should be considered local wallclock time" [Medium,Confirmed] http://launchpad.net/bugs/65868 [05:31] ahh, thanks BjornT [05:31] I was just about to report that [05:31] (and was about 7 seconds away from finding it myself:-) === nictuku [n=yves@ubuntu/member/nictuku] has joined #launchpad [05:49] hi, is "download / +export" the only way to get the a current .po from rosetta? [05:50] nictuku: that or wait for the language pack to turn up in the Ubuntu repository (for Ubuntu translations) === jml prods the process [06:00] New bug: #67058 in blueprint "Person's specifications don't show what project each spec is for" [Undecided,Unconfirmed] http://launchpad.net/bugs/67058 === MagicFab_LUNCH is now known as MagicFab === mholthaus__ [n=mholthau@246.22.76.83.cust.bluewin.ch] has joined #launchpad [06:40] New bug: #67062 in blueprint "Specification page doesn't show who approved/declined it for meetings or when" [Undecided,Unconfirmed] http://launchpad.net/bugs/67062 === MagicFab is now known as MagicFab_Zzz === stu1 [n=stub@ppp-58.8.15.193.revip2.asianet.co.th] has joined #launchpad === raphink [n=raphink@ubuntu/member/raphink] has joined #launchpad [08:00] in gettext-po.h: "int multiline_p" <- spot the lisper === Fujitsu [n=Fujitsu@ubuntu/member/fujitsu] has joined #launchpad [08:22] <_thumper_> morning all [08:23] <_thumper_> could someone email me the pass phrase for the test user in the test suite? [08:24] <_thumper_> or private chat thingy === _thumper_ off to drop off car for servicing [08:25] _thumper_: look at lib/canonical/launchpad/pagetests/README.txt [08:27] jamesh: it's a boolean? [08:27] SteveA: yeah [08:28] or rather "boolean-p" ? [08:28] stu1: ping [08:28] SteveA: pong [08:29] <_thumper_> jamesh: just say no [08:29] spiv: btw, did the gettextpo test suite pass with the change you made? [08:30] jamesh: no, as I said in my mail it still segfaulted. === ryanakca_ [n=ryan@unaffiliated/ryanakca] has joined #launchpad === ryanakca_ [n=ryan@unaffiliated/ryanakca] has joined #launchpad === ryanakca_ [n=ryan@unaffiliated/ryanakca] has joined #launchpad === ryanakca_ [n=ryan@unaffiliated/ryanakca] has joined #launchpad === ryanakca_ [n=ryan@d226-26-139.home.cgocable.net] has joined #launchpad [08:31] spiv: so you did. Looks like a NULL check from previous versions disappeared. [08:32] stub: is staging doing something interesting? I just got a timeout from it? [08:34] SteveA: daily jobs are running. Currently the librarian garbage collector [08:38] Bit of a worry as I've proposed that box as the host for {beta,edge}.launchpad.net. Might need to move staging to carbon at some point, or at least the db. [08:53] mpt: ping [08:54] SteveA, pong [08:54] mpt: conf call in 5 [08:54] yes, thanks [08:55] my hierarchy menu merge to mainline failed [08:55] there's something weird with one of the tests that I'm looking into [08:55] I also mailed you about a CSS weirdness [08:57] mpt: also, merging from mainline, there are many conflicts [08:57] I will work on resolving these [08:57] We must coordinate so we both don't try to resolve conflicts at once === mpt finds his cheap-to-the-UK phone card [09:26] SteveA, do you want me to fix the tests in the conflict-resolution branch, or should you? === carlos [n=carlos@207.Red-83-40-80.dynamicIP.rima-tde.net] has joined #launchpad [09:26] I'm going to revert my confict resolution now, and get some breakfast [09:26] so, do as much as you like / can on that [09:27] and let me know when you're done, and I'll merge from you === raphink [n=raphink@ubuntu/member/raphink] has joined #launchpad [09:28] morning [09:32] carlos: morning. I wanted to chat about those templates [09:32] mdke: hi [09:33] hiya [09:33] mdke: I did nothing because no one was able to give me an answer 100% sure about what to do with it [09:33] quite right, thanks [09:33] if you can talk to me, it's always better [09:33] so anything with installation-guide should NOT be accepted. Sorry about that, I've removed them from the latest source package [09:34] contribute.pot should be accepted. And with the kubuntu ones, I'm curious myself why they are there - kubuntu-docs has those templates already [09:34] perhaps you changed the path [09:35] or the filename [09:35] ok, I'm going to do it right now [09:35] can you tell me what package they were uploaded with? [09:35] you can see it in the import page [09:35] ah, ubuntu-docs [09:36] yep [09:36] that is a mistake by dholbach then. Reject them and I'll let him know [09:36] hmm [09:36] in fact the kubuntu ones [09:36] come from ubuntu-docs too [09:36] that's the reason they are not being imported automatically [09:37] yes. I know what's going on there [09:37] we have a script which removes some stuff from the source package, but daniel must have forgotten to run it before uploading [09:39] ok [09:39] so I should only accept contribute.pot [09:39] right? [09:39] yes. I noticed recently that we forgot to include that pot file in previous uploads [09:39] a bummer for translators :/ [09:40] I see [09:40] ok [09:44] guys, any plans for getting malone to strip pgp stuff out of emails? I send my bugmail with enigmail and it kinda clogs up the comments screen [09:51] mdke: there is a bug open for that (bug 40526), but it's low priority for the moment since we have a lot of other stuff to do. [09:51] Malone bug 40526 in malone "strip inline pgp noise from bug messages" [Low,Confirmed] http://launchpad.net/bugs/40526 [09:51] mdke, there's a bug reported about it, if that's what you mean by "any plans for" [09:51] d'oh, too slow :-) [09:51] mpt: yes it is [09:51] BjornT: thanks === carlos -> bank [09:53] see you later === Seveas [n=seveas@ubuntu/member/seveas] has joined #launchpad === quail [n=quail@unaffiliated/quaillinux/x-000001] has joined #launchpad === Fujitsu [n=Fujitsu@ubuntu/member/fujitsu] has joined #launchpad [10:20] SteveA, I've fixed the pagetests, pushing now [10:20] mpt: great [10:21] I've fixed the hierarchy menus test [10:21] if you can tell me what CSS to change, I'll do that before I merge with pqm [10:24] ugh, it'll take a while for me to fetch your branch === benzai [n=zaheda@82-71-18-29.dsl.in-addr.zen.co.uk] has joined #launchpad [10:24] sorry, should have started that while I was working on the tests in the other branch === frsk [i=fredrik@fsk.name] has joined #launchpad [10:25] latest is in sftp://devpad.canonical.com/code/stevea/launchpad/devel === seb128 [n=seb128@ubuntu/member/seb128] has joined #launchpad [10:26] it shouldn't take long for you to get my branch if you're using a repository [10:26] Indeed I am [10:26] are you using jamesh's setup now? [10:26] I need to switch over to that [10:26] yes [10:27] spiv: ping [10:31] are there any plans to include a better source code browser into LP [10:31] such as bzr webserve? [10:31] SteveA: I've got a plugin that can do a full repository push, but it is a fair bit slower than using rsync (the method I documented on the wiki page for pushing your changes) [10:32] SteveA: maybe it'll have acceptable performance with the smart server [10:32] lucasvo: yes [10:32] SteveA: when? [10:32] we're going to use that, and have links from it to launchpad and back [10:33] I expect in december [10:33] good. I really miss this feauture === ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has joined #launchpad [10:37] SteveA, push finished [10:38] Shall I send it to PQM, or would that just complicate things? [10:38] the push of which is fininshed? [10:38] your latest UI work? [10:38] 2006-10-ui-one-zero [10:38] don't send it to pqm. I'll merge that into my UI branch, then I'll merge in new menus, then I'll push it to PQM [10:39] That's the 1.0 help slot, and (more interesting to you) resolving recent conflicts with mainline [10:39] ok === jinty [n=jinty@135.Red-80-37-34.staticIP.rima-tde.net] has joined #launchpad === lbm [n=lbm@82.192.173.92] has joined #launchpad [11:07] SteveA, in launchpad.css, line 1180 (in the "ul.menuroot" rule), change "font-size: smaller;" to "font-size: 0.675em;" [11:07] That's the only change necessary [11:09] ok [11:09] I'll do that === Fujitsu [n=Fujitsu@ubuntu/member/fujitsu] has joined #launchpad [11:17] SteveA: hi, do you have time for a brief meeting with me? [11:18] carlos: I will have, but I'd rather have later today [11:18] ok [11:18] is that okay, or do you need to tal know? [11:18] no it's not urgent at all [11:19] ok [11:19] SteveA: I have to go to the doctor in less than an hour, so I guess we could have it after lunch, if you have time [11:19] fine [11:19] mpt: darn... still get lots of conflicts [11:19] some "path conflicts" too this time [11:20] SteveA: ok, thanks [11:20] very exciting, I haven't had those before [11:20] ddaa: what's a "path conflict" ? [11:20] for example, the other branch tries to create a filename that's already in the working tree, but with a different file id [11:21] or it tries to add a file in a directory you have deleted [11:21] this sort of shit, when the conflict is in the tree structure [11:21] well, I presume... [11:22] mpt: did you do anything where you did the same thing, but in two divergent trees? [11:22] I'm trying to figure out how these conflicts arose [11:22] it's the dark side of having extensive support for renames... the richest the rename tracking, the more complex the possible conflicts [11:23] SteveA, no. [11:24] And I'm deliberately (for example) blanking obsolete templates instead of deleting them, so if anything changes in them it will be a text conflict rather than a more complicated one [11:25] mh... actually I remember when you get this sort of conflict you do not get a path conflict, you just get a conflict with only file.BASE and file.OTHER [11:25] very strange [11:26] That makes sense, if there's no .THIS file left [11:26] it's a bit surprising the first time though... anyway it's not the current problem [11:28] SteveA, will you have time for bug 65629 today? [11:28] SteveA: do the conflict tree contains files or dirs whose name ends in ".moved"? [11:28] Bug 65629 on http://launchpad.net/bugs/65629 is private [11:28] mpt: yes [11:29] great [11:29] maybe if you deleted a file that has since been modified in the branch you're merging from? [11:30] "when you get this sort of conflict you do not get a path conflict, you just get a conflict with only file.BASE and file.OTHER" [11:31] got that at some point when I merged your bzr compatibility fixes into my cscvs-partial-copy branch, that deleted some of the files you modified [11:31] ddaa: no .moved files [11:31] or if someone deleted a file and then recreated it with a different file ID [11:31] jamesh: that should cause .moved files to pop around, so the two file ids are kept around [11:32] IIRC [11:32] mpt: how did you do the rename to the help_bg.gif icon from options_info_bg.gif ? [11:32] SteveA: no idea, would need to get my hands on the tree [11:32] SteveA, with bzr mv [11:32] thanks for confirming the revert bug with a test case [11:33] so, do I get my leave? :) [11:35] New bug: #67091 in malone "Izzuezilla bug watches are failing to update" [High,Confirmed] http://launchpad.net/bugs/67091 [11:36] mpt: in the style.css, there are changes removing ^M at the end of certain lines [11:36] but not all [11:37] I have no idea what that's about [11:39] I'll just use the one from your branch in that case [11:39] SteveA, merging fresh rocketfuel into 2006-10-ui-one-zero I get one conflict, in Makefile [11:39] so I guess I can't help with any of the problems you're having [11:39] I think there are tabs in the main template [11:39] please look see [11:40] there are indeed [11:41] I don't know why that is, I've had "Insert spaces instead of tabs" turned on the whole time [11:41] One of them is a line I copied and pasted from Usman's work [11:41] but the rest aren't [11:41] please put the 1.0 in progress comments at the end of files [11:41] not in the middle of files [11:42] mpt: in your branch, did you merge my initial bugfix for showing bug pages? [11:42] What file are you talking about? [11:42] specification-index.pt [11:42] SteveA, not in this branch, no [11:42] This branch doesn't have any structural headings in it [11:43] ok [11:43] I think that will explain my conflicts === seb128_ [n=seb128@ANancy-151-1-24-191.w83-194.abo.wanadoo.fr] has joined #launchpad [11:44] mpt: what branch have you been merging from my ui branch into? [11:45] When you said you'd fixed bug 65629, I merged it into 2006-08-ui, because that's the branch I was doing structural headings on [11:45] Bug 65629 on http://launchpad.net/bugs/65629 is private [11:46] carlos? [11:46] carlos: I need your help here: why does http://librarian.launchpad.net/4734954/silva.pot fail to import? [11:47] SteveA, and while I haven't been able to land that branch, I've been doing the help slot on 2006-10-ui-one-zero [11:47] which is what you just merged from [11:47] jordi: let me see... === highvoltage [n=jonathan@196.1.61.12] has joined #launchpad [11:52] jordi: msgfmt accept it so it's a problem in our side [11:53] let me see if I find what's going wrong... [11:53] ok [11:57] carlos: I need to leave for 30 mins, but I invited thisfred here [11:57] jordi: I'm leaving in 10 minutes to the doctor... === thisfred [n=eric@a80-127-80-154.adsl.xs4all.nl] has joined #launchpad [11:58] hello thisfred [12:00] thisfred: hi [12:00] New bug: #67095 in malone "Support status updates of Trac bug watches" [Undecided,Unconfirmed] http://launchpad.net/bugs/67095 [12:05] sry: hi SteveA, hi carlos [12:07] <_thumper_> SteveA: your thoughts on using SoftRequestTimeout for shortlist hardlimit? [12:10] New bug: #67102 in malone "Support status updates of Roundup bug watches" [Low,Confirmed] http://launchpad.net/bugs/67102 [12:11] _thumper_: I agreed a way forward with spiv on this yesterday. === carlos -> doctor [12:12] it was on irc, and I expect spiv to carry this onto the mailing lists etc. are you blocked on this right now? [12:12] <_thumper_> only on that branch [12:12] <_thumper_> can get back to spec-branches [12:12] <_thumper_> I was just trying to finish that off today [12:13] http://people.ubuntu.com/~fabbione/irclogs/launchpad-2006-10-19.html [12:13] 03:35 or so [12:13] starts at 03:32 === _thumper_ looking [12:17] until 03:39 [12:17] <_thumper_> ok, I'll update my branch based on this and push it up and poke spiv for a quick sanity check [12:17] great [12:26] kiko-zzz: ping [12:26] doh === eleusis wonders what timezone kiko's in [12:31] kiko is in brazil [12:31] so, wait a couple of hours === prvul [n=operasux@195.252.85.14] has joined #launchpad === prvul [n=operasux@195.252.85.14] has left #launchpad ["Leaving"] [12:44] SteveA: apparently, we are no longer (have we ever been) firewalled by the debian svn. Succeded at an test import of devscript. Debconf test import is failing because of some known bug. [12:56] thisfred: ok, so carlos had to leave to the doctor [12:56] thisfred: we can have a deeper look when he's back, but this is a flaw in rosetta. [12:56] thisfred: I'll file a bug so it's tracked. === mpt [n=mpt@121-72-131-100.dsl.telstraclear.net] has joined #launchpad [12:57] jordi: ok, thanks for your help! [12:58] thisfred: np! [12:58] as I've said: no real emergency, though I'd like to be kept informed if amything changes [12:59] thisfred: I subscribed to to the bug report [01:00] https://launchpad.net/products/rosetta/+bug/67109 [01:00] Malone bug 67109 in rosetta "Rosetta fails to import a valid silva.pot" [Undecided,Unconfirmed] === Seveas [n=seveas@ubuntu/member/seveas] has joined #launchpad [01:06] New bug: #67109 in rosetta "Rosetta fails to import a valid silva.pot" [Undecided,Unconfirmed] http://launchpad.net/bugs/67109 === malcc [n=malcolm@200-171-140-32.dsl.telesp.net.br] has joined #launchpad === cprov [n=cprov@200-171-140-32.dsl.telesp.net.br] has joined #launchpad [01:13] thisfred: feel free to discuss things in person if you like too :-) [01:13] I am after all sitting in the next room === raphink [n=raphink@ubuntu/member/raphink] has joined #launchpad [01:18] *sigh* people are so creative with svn... [01:18] https://launchpad.net/products/listen/trunk [01:18] https://svn.sourceforge.net/svnroot/listengnome/trunk-0.5 [01:18] SteveA: ah right [01:18] so is that trunk, or is that 0.5? Eh? [01:19] <_thumper_> ddaa, sounds like someone wants that to be trunk of 0.5 [01:19] <_thumper_> bit screwy though [01:19] looks like GMT-2 [01:19] _thumper_: a bit misguided... [01:19] Currently deleting spurious non-trunk imports [01:22] maybe it's half of the trunk [01:22] and the other half is elsewhere === SteveA -> lunch [01:22] and the last log entry on the trunk branch (not trunk-0.5) is "Release 0.5b1"... [01:22] ... === jinty [n=jinty@135.Red-80-37-34.staticIP.rima-tde.net] has joined #launchpad [01:28] thisfred, jordi: It's an encoding problem [01:29] carlos: silva.pot: ASCII PO (gettext message catalogue) text, with very long lines [01:30] because it declares UTF-8? [01:30] it should work [01:30] ASCII is a subset of UTF-8 [01:30] yes [01:31] ('ascii' codec can't decode byte 0xc2 in position 0: ordinal not in range(128)) [01:31] that's the error [01:31] a pot should probably say CHARSET, not UTD-8, but anyway [01:31] not really [01:31] it should say CHARSET if you are completely sure whether it's ASCII [01:31] but if it includes UTF-8 chars, it should be UTF-8 [01:31] I thought CHARSET is used as a template, that needs subtitution [01:31] nod [01:32] gettext works that way [01:32] when there is a msgid with non ascii chars [01:36] I see [01:36] well, with UTF-8 chars, I guess that it would say something else if your msgid is using other encodings [01:36] Actually, it looks like trunk became effectively a stable branch, and the new head is trunk-0.5. All recent development was in trunk-0.5, and trunk merged it when 0.5b1 was released. [01:37] <_thumper_> ddaa, how often are the merge status diffs updated on pending reviews? [01:37] Everytime I peek out into the real world, I become painfully aware of how much "vcs import == series" is a bad model... [01:38] http://headrush.typepad.com/creating_passionate_users/2006/09/easeofuse_shoun.html [01:39] _thumper_: every now and then, give or take a few minutes :) [01:39] IOW, I dunno, really... [01:39] <_thumper_> ok [01:40] New bug: #67115 in rosetta "No easy way to copy and paste the original English translation if it contains special characters" [Undecided,Unconfirmed] http://launchpad.net/bugs/67115 === mdz [n=mdz@217.205.109.249] has joined #launchpad === mdke_ [n=matt@ubuntu/member/mdke] has joined #launchpad [01:46] thisfred, jordi: I found the problem [01:46] #: /views/edit/VersionedContent/tab_status_get_status_link_title.py:37 [01:46] msgid "view \302\253${version_title}\302\273" [01:46] msgstr "" [01:47] the \302\253 and \302\273 chars are the problematic ones [01:47] thisfred: what's that? [01:48] I see... '' and '' [01:55] bother! [01:55] jamesh, still around? [01:55] New bug: #67118 in rosetta "Two adjacent "To continue, you must log in" messages" [Undecided,Unconfirmed] http://launchpad.net/bugs/67118 === benzai [n=zaheda@82-71-18-29.dsl.in-addr.zen.co.uk] has joined #launchpad [01:58] carlos: yes those are correct [01:58] are they not encoded as UTF-8 [01:58] ? [01:59] python doesn't accept them as UTF-8 valid, or at least as we parse it [01:59] I'm doing some testing to see how could we fix it [02:00] thisfred: in the mean time, If you want, I could upload a .pot file without that msgid so the others can be translated while we fix this issue [02:02] carlos: thanx, but if we take out that one, we may find others, I think there are more, so I'll have a look myself to see what is best. I could try giving all special characters symbolic names, and use that as a work around for now. [02:02] mpt: ping [02:02] SteveA, pong [02:02] thisfred: before you change anything, give me one day to see if I figure an easy fix for this issue [02:03] But it could be that one of my tools fouled up the actual encoding, in which case correcting that might fix the file... [02:03] carlos: sure, there is no great hurry at my end [02:04] mpt: can you resolve the css file too? [02:04] well, printing that text in python shows that it's valid UTF-8 [02:04] so I don't think it's a problem in your side === salgado [n=salgado@200-171-140-32.dsl.telesp.net.br] has joined #launchpad [02:06] mpt: I've done all the rest [02:07] great, another entire-file conflict [02:10] this should take about half an hour :-( [02:13] mpt: you know about extmerge? [02:13] no [02:13] uses an external app to resolve merge conflicts, I use kdiff3 [02:13] http://erik.bagfors.nu/bzr-plugins/extmerge/ [02:13] apt-get install kdiff3 === niemeyer [n=niemeyer@200-140-238-196.ctame7043.dsl.brasiltelecom.net.br] has joined #launchpad [02:13] mpt: it's amazing how much pain you guys are willing to endure without asking if there's a better way. [02:13] mpt: It's easier with gvimdiff too === MagicFab_Zzz is now known as MagicFab [02:14] kdiff3 is really great, but you need a large screen and a small font to fit all the information [02:14] mpt: try gvimdiff style.css.THIS style.css.OTHER [02:14] SteveA: the thing is that extmerge automates that for you [02:15] "bzr emerge style.css" and it calls your tool of choice with the conflict files [02:15] gentoo! === mpt installs it [02:16] nah... it helps you "emerge from your pit of textual conflicts" [02:16] mpt: you don't need the syntactic sugar of emerge [02:16] right [02:16] from the gvimdiff, I see there are only about 20 lines different [02:16] most of these are to do with the change from "options" to "help" [02:16] ddaa, there is a better way, which is for bzr merge to be less dumb :-) [02:17] mpt: unattended merging is hard [02:17] mpt: do you understand what you're seeing with gvimdiff style.css.THIS style.css.OTHER ? [02:17] better safe than sorry [02:18] SteveA, kdiff3 has only just finished installing [02:18] I said to use gvimdiff [02:18] 1.15am is not the time to learn vim [02:18] which you may have already [02:18] you don't need to do anything with it except look [02:19] bash: gvmdiff: command not found [02:19] gvimdiff [02:19] E: Couldn't find package gvmdiff [02:19] you're missing the I [02:19] gahhh [02:19] gvimdiff [02:19] but the kde tool should be equivalent [02:19] That package is unknown either [02:20] s/either/too/ [02:20] meld is also nice :) [02:20] it's a command [02:20] did you try the command gvimdiff ? [02:20] thisfred: meld does not do merges AFAIK [02:20] or just vimdiff ? [02:20] ddaa: we're just trying to compare two files [02:20] gvimdiff is from vim-gnome [02:20] mpt, ^ === thisfred butts out === ddaa goes back to the peanut gallery [02:21] ddaa: so I think meld would be fine [02:21] but I just want to get mpt using something here [02:21] meld's great for viewing diffs [02:21] there's a plugin do do "bzr diff" with meld too :) === matsubara [n=matsubar@200-171-140-32.dsl.telesp.net.br] has joined #launchpad [02:22] ok, kdiff3 show me the diffs very nicely, but how to resolve them is completely non-obvious [02:22] mpt: privmsg === bradb [n=bradb@modemcable077.58-130-66.mc.videotron.ca] has joined #launchpad [02:46] carlos: ping [02:49] SteveA: pong [02:49] carlos: do you know well about how staging is set up? [02:49] I think so, yes [02:49] I tried doing some stuff on there, and it looks like rf-built is rsynced over to there [02:49] no [02:49] it uses a local mirror === Nafallo [n=nafallo@ubuntu/member/nafallo] has joined #launchpad [02:50] but that the launchpad bzr tree is broken, maybe it was rsynced mid-way through a pull [02:50] or push [02:50] I don't remember how is prepared the mirror [02:50] and I don't have access to that machine anymore [02:50] ok, don't worry then [02:51] I think you can force the mirror, though [02:52] any idea how? [02:52] do a 'crontab -l' as launchpad user [02:52]