=== jamesh [~james@203-59-217-65.dyn.iinet.net.au] has joined #launchpad [06:33] jblack: have to head out now...catch up later I guess === BradB [~bradb@modemcable046.50-70-69.mc.videotron.ca] has joined #launchpad === carlos [~carlos@69.Red-80-33-181.pooles.rima-tde.net] has joined #launchpad [10:15] morning [10:51] spiv: ? === carlos -> breakfast === cprov [~cprov@200.158.100.251] has joined #launchpad [12:11] carlos: time for almuerzo dude [12:12] jordi: that's in your case, not in mine :-) [12:12] :) === debonzi [~debonzi@200.158.100.251] has joined #launchpad === salgado [~salgado@200-206-134-238.async.com.br] has joined #launchpad [02:18] wow, database/schema/Makefile hurts my eyes [02:20] daf: why? [02:20] it's pretty hairy [02:20] I'm glad I don't have to maintain that [02:21] :-P [02:27] carlos: "aleatory"? [02:27] daf: ? [02:27] + # XXX: Carlos Perello Marin 03/12/2004: Epiphany seems to have an [02:27] + # aleatory bug with upload forms (or perhaps it's launchpad because [02:27] daf: random O:-) [02:27] es? :) [02:27] my spanglish, you know [02:27] ah :) [02:28] en_ES :) [02:28] yeah :-P [02:29] daf: are you going to fix it? [02:29] or should I do it? [02:36] I'll do it [02:46] carlos: don't use "if type(x) is Foo" [02:46] daf: why? [02:47] if you must do type checking, always use "if isinstance(x, Foo)" [02:47] daf: I think Steve said we should use it instead of isinstance [02:47] really? [02:47] daf: remember the proxy thing [02:47] hmm [02:47] are file uploads security-proxied? [02:47] if you use isinstance you get a proxy object instance instead of what you want [02:47] daf: no idea === carlos -> lunch [03:23] Merge to rocketfuel@canonical.com/launchpad--devel--0: fix bug with losing languages parameter from URLs (patch-1132, daf@canonical.com) [03:25] jblack, is there something I can do in case a merge --two-way fails with "PANIC: unable to fork for hook"? [03:32] salgado: this is a bug in baz [03:32] salgado: perhaps you can use "baz merge --star-merge --two-way"? [03:34] daf, yeah, I've seen the bug, and this is why I tried the --two-way. [03:34] I'm going to try with --star-merge now === daf can't find the bug report in bugzilla [03:39] daf, https://bugzilla.ubuntu.com/show_bug.cgi?id=4756 [03:39] isn't this? [03:39] oh, right [03:39] I got the error when executing the hook, not when running diff [03:40] thanks [03:40] Merge to rocketfuel@canonical.com/launchpad--devel--0: various changes to the translation page (patch-1133, daf@canonical.com) [03:41] daf, np. ;) [03:41] daf, running with --star-merge --two-way worked for you? [03:41] "baz merge --star-merge" worked for me [03:41] I didn't use --two-way [03:52] Merge to rocketfuel@canonical.com/launchpad--devel--0: add initial canonical.rosetta.tar library (patch-1134, daf@canonical.com) === salgado is now known as salgado-lunch === lamont [~lamont@mix.mmjgroup.com] has joined #launchpad [04:28] so what is the baz equivalent of 'tla tag' again? [04:30] baz branch? [04:31] thanks === salgado-lunch is now known as salgado === sabdfl [~mark@213.9.209.4] has joined #launchpad [04:58] sabdfl: hi [04:59] sabdfl: now that malone is open to the world, could we use it to track the rosetta's bugs? [05:16] carlos: good idea! [05:18] sabdfl: what should be done? [05:18] just create a Rosetta product and that's all? [05:18] carlos: create a project called "The Launchpad" [05:19] then create products for malone and rosetta [05:19] ok [05:19] so we can file bugs against them there [05:19] we can use the dogfood server for security-related bugs till we have a security bug tracking feature in malone [05:21] sabdfl: should we add a link to malone at the main launchpad web page? [05:22] hola people [05:25] jordi: hey [05:27] ok, it's ready [05:30] carlos: do I need a separate malone account? [05:30] no [05:30] ok [05:30] jordi: same account [05:30] as it insists in telling me to "join" [05:30] ? [05:31] ohh, that link... [05:31] it's broken at the moment... [05:31] so don't worry about it [05:32] jordi! [05:32] carlos: yes please, just a small one :-) [05:32] sabdfl: could we "kill" the join link ? [05:33] the foaf part of launchpad is closed and I think it will confuse the userd [05:33] /s/userd/users/ [05:33] hi mark! [05:34] hey, I got #3 :) [05:34] carlos: now, go fix! :) === carlos hides [05:35] tell me if that was the correct product/whatever. It's not trivial: the "full list" link does a popup, but it doesn't show anything. [05:37] jordi: dude, you have an entry box with a search button ;-) [05:39] which shows nothing, no matter what I input [05:39] I mean [05:39] I try to search for rosetta and the button doesn't appear to do anything. It's as if it didn't do anything. [05:40] jordi: it works here... [05:41] I typed "rosetta" and did a submit [05:41] and I got: [05:41] rosetta [05:41] The Rosetta Translation Portal [05:41] hmm === jordi tries again. [05:44] I... I assure you it wsn't working. [05:44] I tried 3 times. === jordi blushes. [05:47] URL? [05:47] https://launchpad.ubuntu.com/malone/bugs/+product [05:47] from there and using (list) link works here === sabdfl [~mark@213.9.209.4] has left #launchpad [] === debonzi [~debonzi@200.158.100.251] has joined #launchpad === debonzi [~debonzi@200.158.100.251] has left #launchpad [] === debonzi [~debonzi@200.158.100.251] has joined #launchpad [06:33] carlos: yeah, I'm saying it works now. [06:33] jordi: what changed? === elmo [~james@82.211.81.249] has joined #launchpad === cprov [~cprov@200.158.100.251] has joined #launchpad [06:45] carlos: who knows. [06:56] aarrrrggg === carlos blames baz [06:58] I have lost some code because a conflict and I didn't noticied it, baz does NOT works yet as cvs/svn merging conflicts [06:58] the dailies do [06:58] you can't commit until they resolved [06:58] bob2: my version is from last week [06:59] bob2: and baz redo [06:59] told me about a conflict [06:59] but the file didn't had any mark so I thought it was an error on baz [06:59] and resolved the conflict and removed the .rej and .orig [06:59] and I suppose that I have lost that change [06:59] how did you lose code if it didn't have conflict markers? [07:00] bob2: because I know that the code was there but it's not now [07:00] bob2: a bug in baz? [07:00] could be... [07:00] the actual file contents diffing is done by the regular diff program, tho... [07:00] carlos@frodo ~/Work/dists/launchpad $ baz redo [07:00] * linting the source tree [07:00] C lib/canonical/rosetta/scripts/import_from_apt.py [07:00] **************************************************** [07:00] Conflicts created while merging. Please resolve all [07:00] conflicts and then run baz resolved --all [07:00] **************************************************** [07:00] carlos@frodo ~/Work/dists/launchpad $ gvim lib/canonical/rosetta/scripts/import_from_apt.py [07:00] carlos@frodo ~/Work/dists/launchpad $ baz resolved --all [07:00] that's the output [07:01] when I saw that the file does not have any >>>> or <<<< [07:01] so you merged, got a conflict, resolved it, then commited and the merge was gone? [07:01] strings I executed the baz resolved --all [07:01] no [07:01] bob2: I did a baz undo [07:01] star-merge [07:01] hm [07:01] commit [07:01] baz redo [07:01] oh, and the undone code was gone? [07:02] and got a conflict (because other local changes I did before remembered the baz undo thing) [07:02] oh [07:02] bob2: only the part that conflicted [07:02] ok, so, from the begininng: [07:02] local edit [07:02] other changes remain there [07:02] star-merge [07:02] undo [07:02] star-merge [07:03] commit [07:03] redo [07:03] no, sorry [07:03] ? [07:03] local edit [07:03] undo [07:03] star-merge [07:03] commit [07:03] local edit [07:03] noticied that my changes are in the undo directory [07:03] removed by hand some changes (seems like I forgot some of them) [07:03] redo [07:04] conflict due some local changes were still there [07:04] and I lost the conflict code from the undo directory [07:04] hm [07:04] oh [07:05] redo will not have made <<<<<-style conflict markers [07:05] right, the file does not have such markers [07:05] right [07:06] so if you got conflicts, then deleted the .mod and .orig files, tthen you've lost data :/ [07:06] bob2: I know :-( [07:06] I thought that they were useless [07:06] does this sound like what happened? [07:06] bob2: yeah [07:06] ah [07:06] hm [07:07] wouldd it make more sense to you if redo produced 3-way-style markers? [07:07] bob2: don't know how they look like [07:08] the <<<< ones [07:08] in the file [07:08] yeah [07:08] that's what I expected [07:08] that's why I removed the .orig and .rej files [07:08] right [07:09] because usualy the .rej is empty (with a message that you should look at the file) [07:09] file a bug asking that redo do that then? :) [07:09] yeah [07:09] ok [07:09] bob2: are you using malone now? [07:09] especially now that -t is the default for star-merge, it's confusing that redo does not [07:09] erm, I don't know [07:16] I know we were going to switch at some point, but I on't know if we did [07:17] bob2: it's open to the public atm [07:17] so I suppose that it depends on you to use it for bazaar [07:17] we are going to use it for Rosetta as soon as I send the announcement tonight [07:18] oh, cool [07:22] no bugs on bazaar in it yet, I'll wait for robert or brad to tell me it's ready to roll, I think [07:22] bob2: brad is on holidays [07:23] ah [07:23] so is robert [07:32] bob2! === jblack reads back === salgado is now known as salgado-afk [07:59] Yeah. I don't believe redo isn't doing three way yet. [08:07] stub/spiv: around ? [08:17] jblack: ? [08:17] Yeah? [08:18] jblack: I need to reboot production and devel supermirror - ok? [08:18] checking [08:19] go ahead [08:20] thanks, rebooting [08:20] it won't hurt devel if you reboot it whenever you like. [08:20] on production, the only thing you need to watch out for is whether or not tla is running [08:21] Everything I write is lock safe, but tla itself isn't. [08:23] okay, both back [08:24] thanks === salgado-afk is now known as salgado === stub [~stub@dsl-246.248.240.220.dsl.comindico.com.au] has joined #launchpad === debonzi [~debonzi@200.158.100.251] has left #launchpad [] === cprov [~cprov@200.158.100.251] has left #launchpad [] [11:48] hey stub. you haven't commited that patch for the preferred email and the temp email table, right?