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