=== cpg is now known as cpg|brb | ||
=== cpg|brb is now known as cpg | ||
=== cpg is now known as cpg|brb | ||
=== cpg|brb is now known as cpg | ||
nUboon2Age | kermiac: ping | 04:50 |
---|---|---|
kermiac | nUboon2Age: !pong | 04:50 |
kermiac | nUboon2Age: ?? | 04:52 |
=== cpg is now known as cpg|away | ||
=== cpg|away is now known as cpg | ||
kermiac | jdobrien: I think Bug 607716 that you reported is related to the person who reported Bug 608011. 608011 now contains DEBUG logs | 08:25 |
ubot4 | Launchpad bug 607716 in ubuntuone-client "UnicodeDecodeError when syncing file (affects: 2) (heat: 10)" [Undecided,New] https://launchpad.net/bugs/607716 | 08:25 |
ubot4 | Launchpad bug 608011 in ubuntuone-client (Ubuntu) "errors in syncdaemon.log (affects: 1) (heat: 8)" [Undecided,Incomplete] https://launchpad.net/bugs/608011 | 08:25 |
=== JUMPA is now known as jumpa | ||
rawad | hi there | 09:53 |
rawad | i have a problem with ubuntu and blade server HS22 and DS4700 | 09:53 |
rawad | can anybody help me plz | 09:54 |
rawad | i need help with blade servers | 09:56 |
rawad | can you help plz | 09:56 |
rawad | u1sdtool -q; killall ubuntuone-login; u1sdtool -c | 10:05 |
rawad | honk | 10:05 |
=== jumpa is now known as JUMPA | ||
=== JUMPA is now known as jumpa | ||
=== dendro-afk is now known as dendrobates | ||
=== cpg is now known as cpg|away | ||
=== jumpa is now known as JUMPA | ||
=== JUMPA is now known as jumpa | ||
duanedesign | morning all | 11:47 |
kermiac | o/ | 11:48 |
kenvandine | didrocks, did you try deleting your ~/.config/desktop-couch/desktop-couchdb.ini | 11:52 |
kenvandine | ? | 11:52 |
didrocks | kenvandine: yeah, it was regenerated | 11:53 |
didrocks | kenvandine: but not the .html file | 11:53 |
duanedesign | morning didrocks | 11:54 |
didrocks | hey duanedesign, how are you? | 11:54 |
duanedesign | well morning here :) | 11:54 |
didrocks | almost lunch time there! | 11:54 |
duanedesign | didrocks: i am really good. Trying to do some packaging this morning | 11:54 |
didrocks | oh sweet :) | 11:55 |
didrocks | packaging stipple? | 11:55 |
duanedesign | didrocks: it is next. I am packaging my other current project CLIcompanion. | 11:55 |
mkarnicki | morning all | 11:56 |
duanedesign | didrocks: you having some couch issues today? | 11:57 |
didrocks | duanedesign: well, I'm on my netbook right now and I killed beam.smp because it was taking too much CPU | 12:02 |
didrocks | and it's already hell there :) | 12:02 |
didrocks | duanedesign: the thing is, I want futon back :) | 12:02 |
duanedesign | kermiac: ping | 12:27 |
kermiac | howdy duanedesign :) | 12:27 |
duanedesign | kermiac: the gnomekeyring Daemon error. I now the temporary solution is to start the daemon, but what is the long term solution | 12:31 |
duanedesign | i cant seem to remember | 12:31 |
kermiac | hmm... it's been a while since I looked at that. one sec mate, I'll look for the bug report | 12:32 |
kermiac | duanedesign: I'm pretty sure this was the workaround that was working best - https://bugs.edge.launchpad.net/ubuntuone-client/+bug/579158/comments/9 | 12:35 |
ubot4 | Launchpad bug 579158 in ubuntuone-client (Ubuntu) (and 1 other project) "nothing happens when i click on the ubuntu one icon from the menu or the me menu (dup-of: 567194)" [High,New] | 12:35 |
ubot4 | Launchpad bug 567194 in ubuntuone-client "Lucid Ubuntuone preferences not starting gnomekeyring.IOerror (affects: 11) (dups: 2) (heat: 50)" [High,New] | 12:35 |
kermiac | duanedesign: but it *may* be fixed as I haven't seen a bug report on that issue for quite a while | 12:35 |
=== teknico is now known as teknico_away | ||
duanedesign | thank you kermiac | 12:50 |
kermiac | duanedesign: no probs mate :) | 12:50 |
mkarnicki | hi duanedesign , need a lil help here :) | 12:55 |
mkarnicki | a localy removed folder sits there in the cloud | 12:55 |
mkarnicki | plus: mike@dojo:~$ u1sdtool --status | 12:55 |
mkarnicki | State: QUEUE_MANAGER connection: With User With Network description: processing queues is_connected: True is_error: False is_online: True queues: IDLE | 12:55 |
mkarnicki | o crap not this paste | 12:55 |
mkarnicki | mike@dojo:~$ u1sdtool --status | 12:56 |
mkarnicki | State: QUEUE_MANAGER connection: With User With Network description: processing queues is_connected: True is_error: False is_online: True queues: IDLE | 12:56 |
mkarnicki | u1 is idle. | 12:56 |
mkarnicki | that may be related to that problem (is it a known bug?): create a folder in /Ubuntu One. u1 works on it, appears in the cloud, but the icon never changes to be marked with green tick | 12:57 |
mkarnicki | it's with these 'two syncing arrows' plus.. a grayed out small exclamation mark I think. | 12:57 |
mkarnicki | any ideas? | 12:57 |
mkarnicki | my laptop is up to date | 12:57 |
mkarnicki | runnin 10.04 | 12:57 |
mkarnicki | I'd honk, but rye's not around ;< | 12:58 |
duanedesign | mkarnicki: is everything syncing ok? It is just the emblem is not displaying correctly? | 12:58 |
mkarnicki | duanedesign: I did sync 2 1meg files yesterday, to it seems to be fine | 12:59 |
mkarnicki | just the emblems. plus, a folder in WebUI that has been removed locally | 12:59 |
mkarnicki | can I force a local rescan somehow? | 12:59 |
duanedesign | mkarnicki: strange. there was a user in 2 days ago that removed a folder locally and it did not get removed from cloud | 13:00 |
mkarnicki | I'll try replicating that problem again | 13:00 |
* mkarnicki creates a folder | 13:00 | |
mkarnicki | duanedesign: looks like one-time-problem or nondeterminate behaviour. I created/deleted a folder, and WebUI followed correctly. | 13:01 |
mkarnicki | I'll remove the cloud folder then, manually. | 13:01 |
duanedesign | mkarnicki: http://paste.ubuntu.com/466999/ here is a log from the user the other day | 13:03 |
duanedesign | line 116 | 13:03 |
duanedesign | the unlink warning. I wonder if your syncdaemon.log has something similar | 13:04 |
duanedesign | mkarnicki: the emblem problem. Does clicking the 'Refresh' button update the icon emblem? | 13:04 |
mkarnicki | duanedesign: remind me please where is the log located | 13:04 |
duanedesign | mkarnicki: ~/.cache/ubuntuone/log/ | 13:05 |
mkarnicki | duanedesign: brb phone call | 13:05 |
mkarnicki | duanedesign: strangely enough, when I complained, the emblems started to work. I'll double-check | 13:08 |
mkarnicki | duanedesign: I checked twice. WebUI followed and emblems worked. now I created folder 'blah', it's in WebUI but emblem is wrong | 13:10 |
mkarnicki | even after refreshes | 13:10 |
mkarnicki | I'll see the log | 13:10 |
mkarnicki | duanedesign: connected: true, queues: IDLE, emblem still not a green tick, pretty much trafic as for empty folder 'blah': http://paste.ubuntu.com/467484/ | 13:14 |
mkarnicki | duanedesign: Looks like the emblem won't change. | 13:20 |
duanedesign | mkarnicki: looks like i can reproduce that here locally | 13:20 |
* duanedesign is looking to see if there is a bug report on this | 13:21 | |
mkarnicki | duanedesign: good (that you can reproduce that) | 13:21 |
mkarnicki | duanedesign: thanks | 13:21 |
duanedesign | hmm. Refresh updated the emblem. That does not work for you? | 13:24 |
mkarnicki | it did twice. and now twice (for folders blah and blah2 not, under /Ubuntu One/TestDir1) no, didn't help | 13:25 |
mkarnicki | sorry, I sound onfusing. it did work for some folders. but now again refresh didn't help, for folders /U1/TestDir1/blah and /U1/TestDir1/blah2 | 13:26 |
* mkarnicki aquarius in the meantime, I wanted to share an ide with you. (TBD no soone than few months, but it's worth discussing). | 13:29 | |
mkarnicki | aquarius: ops, I'll send a priv | 13:29 |
duanedesign | mkarnicki: i think i have reproduced it. It seems it is the directory level | 13:31 |
duanedesign | mkarnicki: ~/Ubuntu\ One/folder will update emblem with refresh. ~/Ubuntu\ One/folder/folder2 will not | 13:32 |
mkarnicki | duanedesign: I see. Thank you. Should I file a bug? | 13:36 |
duanedesign | mkarnicki: i do not see a bug report for that issue. | 13:42 |
mkarnicki | duanedesign: filing bug | 13:46 |
* mkarnicki checks if it's the same with files | 13:46 | |
mkarnicki | yes it is | 13:47 |
=== teknico_away is now known as teknico | ||
* mkarnicki filed Bug #608721 | 13:50 | |
ubot4 | Launchpad bug 608721 in ubuntuone-client "Icon emblems won't update on nested folders and files (affects: 1) (heat: 6)" [Undecided,New] https://launchpad.net/bugs/608721 | 13:50 |
mkarnicki | duanedesign: you can confirm the bug | 13:51 |
duanedesign | mkarnicki: i will confi..... | 13:51 |
duanedesign | :) | 13:51 |
mkarnicki | :) | 13:51 |
duanedesign | what is the saying, great minds think alike ;) | 13:51 |
mkarnicki | duanedesign: ;) | 13:56 |
mkarnicki | duanedesign: I thought of writin the same thing, but could not recall how that was in English ;D | 13:56 |
Chipaca | Ubuntu One Desktop+ team standup starting in mumble | 14:00 |
rodrigo_ | hmm, mandel is talking it seems, but can't hear anything | 14:02 |
rodrigo_ | hmm, can't hear anything :( | 14:03 |
mandel | rodrigo_ I said nothing too interesting ;) | 14:07 |
rodrigo_ | well, people are talking, and still can't hear, so it's not only you :( | 14:07 |
mandel | rodrigo_ windows blah blah blah windows blah blah blah | 14:08 |
rodrigo_ | it worked this morning | 14:08 |
mandel | rodrigo_ works here.. thisfred on... strange | 14:08 |
rodrigo_ | :( | 14:10 |
thisfred | yeah I hear lots of gaps too | 14:10 |
rodrigo_ | I hear nothing here, but I "see" you talking | 14:11 |
Chipaca | rodrigo_: :( | 14:11 |
rodrigo_ | yeah, not sure what's up, it worked this morning | 14:11 |
Chipaca | rodrigo_: you want to report old-style in the chat? | 14:11 |
mandel | rodrigo_ read our lips ;) | 14:11 |
rodrigo_ | mandel, :) | 14:11 |
rodrigo_ | Chipaca, yeah | 14:11 |
rodrigo_ | Chipaca, worked a bit on the single selection, and seems, again, it's not going to be easy, the GTK widgets are not prepared for that, so it works a little bit, but fails for other bits | 14:12 |
rodrigo_ | Chipaca, also applied your patch for the rb plugin and did a new release/package | 14:12 |
mandel | mumble and irc == mandel multitask fail | 14:13 |
Chipaca | rodrigo_: ok. can we meet you, rmcbride_ and me to talk about qa in a few minutes? | 14:13 |
rodrigo_ | Chipaca, and also, a bit blocked on syncdaemon not uploading a new UDF I created which I need to test my check-no-shares-before-disabling-udf | 14:13 |
rodrigo_ | it's been 24 hours since I created the UDF, and still get_shared returns a NULL path, which makes my code not detect the share | 14:13 |
rodrigo_ | Chipaca, yeah, sure | 14:13 |
rodrigo_ | I'll try to fix mumble while you finish the standup | 14:14 |
Chipaca | rodrigo_: ok, we can talk about unblocking you on that after the meeting | 14:14 |
rodrigo_ | ok | 14:14 |
CardinalFang | rmcbride_, the codec or something screams a hiss when your mic saturates. It hurts. | 14:14 |
Chipaca | rodrigo_: rmcbride_: vds: I'm running on battery, and my ups is probably close to its death right now | 14:14 |
rmcbride_ | CardinalFang: I'll tweak the gain. mic is about 4 feet away, pulseaudio seems to have a randomization factor X( | 14:15 |
rodrigo_ | oh, now I can hear! | 14:15 |
rodrigo_ | I had to mute and unmute the volume control applet | 14:15 |
thisfred | I really hear two words and then miss two | 14:16 |
thisfred | ok, I hear mostly nothing now so I'm gonna assume meeting's over | 14:19 |
thisfred | mumble is so fickle | 14:19 |
mandel | thisfred, I was going to say the same.. | 14:19 |
rodrigo_ | nobody is talking | 14:20 |
rodrigo_ | Chipaca, is your battery dead? | 14:20 |
mandel | guess who has to reboot again???? Fucking windows! | 14:20 |
thisfred | when it works, it works great, better than skype with a sizeable group for lag etc. | 14:20 |
Chipaca | grr | 14:21 |
Chipaca | ups died | 14:21 |
Chipaca | hello? is this working? | 14:22 |
rmcbride_ | I think you need to increase your IRC gain, Chipaca | 14:23 |
Chipaca | 𝗵𝗲𝗹𝗹𝗼 | 14:23 |
rmcbride_ | heh | 14:23 |
Chipaca | :) | 14:24 |
* rmcbride_ goes to get another soda before the QA call/discussion | 14:25 | |
rodrigo_ | Chipaca, qa meeting now? | 14:25 |
rmcbride_ | re | 14:26 |
Chipaca | rodrigo_: let me wrap up the standup fur real :) | 14:26 |
rodrigo_ | ok :) | 14:27 |
dobey | rodrigo_, aquarius: how does one run tests in the rb plug-in? | 14:32 |
rodrigo_ | dobey, there are no tests afaics | 14:33 |
dobey | :( | 14:33 |
aquarius | it's darn nearly impossible to test a rhythmbox plugin without either (a) using some kind of gui testing tool, none of which were in any way reliable when I wrote the plugin, or (b) mocking the whole RB setup and API, at which point your "tests" basically test whether Python can call a function. | 14:35 |
aquarius | hence there being no tests. I wasn't happy about it myself either :( | 14:35 |
dobey | aquarius: well, there are other things that should still be there | 14:35 |
dobey | aquarius: lint for example :) | 14:35 |
dobey | i'll get ubuntuone-dev-tools packaged up and add a script to the plug-in to do the lint checking and the intltool checks | 14:37 |
dobey | rodrigo_, aquarius: anywya, i've got it set up in tarmac now, but without tests of course, since there are none yet | 14:56 |
rodrigo_ | dobey, cool | 14:57 |
mkarnicki | verterok: Thanks for prompt response! Will try that snippet. | 16:26 |
=== beuno is now known as beuno-lunch | ||
verterok | mkarnicki: np | 16:27 |
aquarius | rodrigo_, ping? | 16:30 |
aquarius | CardinalFang, ping? | 17:47 |
czajkowski | aloha | 17:48 |
czajkowski | CardinalFang: you about | 17:48 |
aquarius | CardinalFang, czajkowski has desktopcouch using 70% CPU constantly -- would be useful to work out what's doing it so we can put a stop to it | 17:49 |
mandel | vds, ping | 17:52 |
CardinalFang | aquarius, hi. | 17:54 |
CardinalFang | czajkowski, hi | 17:54 |
CardinalFang | Er, okay. I know as much about the internals of couchdb as you do, aquarius. I assume the process eating CPU is 'beam', yes? | 17:55 |
czajkowski | CardinalFang: yes evil beam that I end up killing | 17:56 |
CardinalFang | czajkowski, is it nice'd at all? | 17:57 |
czajkowski | CardinalFang: at sleeping it go betwwen 46-72% so i kill t | 17:57 |
czajkowski | when it's running it'a 1t 100% | 17:57 |
CardinalFang | czajkowski, ah. I've heard of problems with sleeping causing it to go bonkers, often exiting. | 17:57 |
CardinalFang | czajkowski, do you mind joining me in the #couchdb channel? | 17:57 |
czajkowski | nope | 17:58 |
czajkowski | let me restart the machine as atm it's killed | 17:58 |
=== beuno-lunch is now known as beuno | ||
vds | mandel: pong | 18:04 |
mandel | vds, I finally got the bloody thing working!! :D | 18:04 |
vds | mandel: which one? | 18:04 |
mandel | vds, this: https://code.edge.launchpad.net/~mandel/ubuntuone-windows-installer/install_service_wix/+merge/30685 | 18:04 |
mandel | vds, test when ever you can ;) | 18:04 |
vds | mandel: and the other branch | 18:04 |
vds | ? | 18:05 |
vds | mandel: you still need a review on that? | 18:05 |
mandel | vds, yes, please review that one too | 18:05 |
mandel | this new one depends on the other one | 18:05 |
vds | mandel: from which directory I have to run the InstallUtils? | 18:05 |
vds | mandel: if I run it from the root of the branch I got an error | 18:06 |
mandel | installUtil should be ran from the same location where the .exe is | 18:06 |
mandel | vds, you have to go to install/build_results | 18:06 |
vds | mandel: which .exe? | 18:07 |
vds | the msi? | 18:07 |
mandel | vds, InstallUtil Canonical.UbuntuOne.ProcessDispatcher.exe | 18:08 |
vds | there is no build_results in install | 18:08 |
vds | mandel: ^^ | 18:08 |
mandel | vds, did u do nant installer? | 18:09 |
vds | mandel: yes | 18:09 |
mandel | vds, you should have a build_results | 18:09 |
mandel | muffinresearch, did u have this ^ problem? | 18:10 |
vds | mandel: no build_results folder | 18:10 |
mandel | vds, really? | 18:11 |
mandel | which branch is that? | 18:11 |
vds | mandel: really really | 18:11 |
mandel | vds, mm I dont know, let me go for a jog and I'll take a look | 18:12 |
vds | mandel: ok | 18:12 |
mandel | vds, my brain is damaged right now :P | 18:12 |
=== mandel is now known as mandel_afk | ||
=== dendrobates is now known as dendro-afk | ||
=== cpg|away is now known as cpg | ||
CardinalFang | aquarius, I don't see anything wrong with cz's database. | 18:59 |
aquarius | CardinalFang, apart from it using all the CPU all the time, obviously. Strange. Is there any way of telling what it's doing that's causing it to eat CPU? | 19:00 |
aquarius | I know that people have complained about this before, so I was hoping that this would help us narrow down on what the problem actually is | 19:01 |
CardinalFang | aquarius, I got his log to verbose. Watching the log should tell us of outside access. | 19:01 |
aquarius | (her log) | 19:01 |
CardinalFang | aquarius, If she stops the outside access, does it stop the load? | 19:01 |
aquarius | don't know | 19:02 |
czajkowski | CardinalFang: what do you means stop the outsides access sorry ? | 19:02 |
CardinalFang | aquarius knows, czajkowski. Gwibber-service, et c. He can tell by what URLs are accessed. | 19:02 |
aquarius | czajkowski, are you using gwibber? does quitting it (making sure that gwibber-service is also quit) stop the CPU? | 19:02 |
CardinalFang | aquarius, Oh, sorry, I assumed you two were close, spatially. | 19:03 |
czajkowski | aquarius: well not stared it, from the me menu but I'll go kill services | 19:03 |
czajkowski | CardinalFang: if I were in hands reach of aquarius you'd have been left alone :) | 19:03 |
CardinalFang | Well, he's a slippery fellow. | 19:03 |
aquarius | CardinalFang, well, I'm closer to her than you are, but we're still separated by at least one sea :) | 19:04 |
czajkowski | heh | 19:04 |
CardinalFang | Sorry! I assumed you both were at the Prague sprint. | 19:04 |
czajkowski | gwibber sercices is now at a state of Zombie | 19:04 |
czajkowski | CardinalFang: I'm community not canonical | 19:04 |
czajkowski | wow beam is at 0% | 19:05 |
* aquarius is not in prague either :) | 19:05 | |
czajkowski | spoke too soon up at 40% | 19:06 |
aquarius | is gwibber or gwibber-service running? | 19:06 |
czajkowski | nope both sleeping | 19:07 |
CardinalFang | "Sleeping" is still running. When you look, the looker is probably the only running app, but another app gets CPU time every 1/100th of a second. | 19:08 |
aquarius | kill -9 both of them | 19:08 |
czajkowski | done | 19:09 |
aquarius | and now, CPU? | 19:09 |
czajkowski | no difference still at 40% | 19:10 |
czajkowski | CardinalFang: thanks for you help | 19:13 |
CardinalFang | czajkowski, run this: | 19:14 |
CardinalFang | watch -n 5 -d 'grep GET.\*200 ~/.cache/desktop-couch/desktop-couchdb.log.1 |cut -d/ -f2 |cut -d\ -f1 |sort |uniq -c' | 19:15 |
czajkowski | 3 _all_dbs | 19:16 |
czajkowski | 1157 gwibber_accounts | 19:16 |
czajkowski | 11639 gwibber_messages | 19:16 |
czajkowski | 115 gwibber_preferences | 19:16 |
czajkowski | 31 management | 19:16 |
CardinalFang | That should change over time. Every 5 seconds. | 19:16 |
=== teknico is now known as teknico_away | ||
czajkowski | CardinalFang: nothing changes | 19:19 |
CardinalFang | czajkowski, ah, since you killed those apps, yes. | 19:19 |
CardinalFang | czajkowski, and now how is your CPU load? | 19:20 |
czajkowski | still at 40$ | 19:20 |
CardinalFang | czajkowski, even now? | 19:28 |
* alecu should remember to re-enable NetworkManager after testing nm dbus stuff :P | 19:46 | |
beuno | only if you like the internet | 19:46 |
CardinalFang | beuno, hi! Tell me about the Android! mkarnicki digs it too. | 20:11 |
=== jumpa is now known as JUMPA | ||
=== cpg is now known as cpg|brb | ||
verterok | mkarnicki: pushed revno 27, should stop dying an horrible death | 21:55 |
=== cpg|brb is now known as cpg | ||
mkarnicki | verterok: you're fast :O | 21:55 |
* mkarnicki tries new revision | 21:56 | |
verterok | mkarnicki: be aware that the notification handling code is quitye incomplete :( | 21:56 |
verterok | mkarnicki: I'll try to hack on it on the weekend | 21:56 |
mkarnicki | verterok: no worries. I would prefer to have them off then have them on and get the client broken on first notification :) | 21:57 |
verterok | mkarnicki: they are on :) | 21:58 |
=== dendro-afk is now known as dendrobates | ||
* mkarnicki test the app, hopes it won't die on me :) | 22:00 | |
=== dendrobates is now known as dendro-afk | ||
=== dendro-afk is now known as dendrobates | ||
verterok | mkarnicki: I shouldn't die with NODE_STATE notifications ;) | 22:01 |
mkarnicki | \o/ ! | 22:01 |
mkarnicki | verterok: it worked! | 22:02 |
mkarnicki | verterok: should I have a look in the code, or can you tell me in 1 sentence how did you fix that? | 22:02 |
mkarnicki | verterok: hahahah, I may have formulated that badly, I meant I hoped the application wouldn't die ;D | 22:03 |
verterok | mkarnicki: gimme 2' phone | 22:05 |
mkarnicki | verterok: np! /me looks at the code | 22:05 |
verterok | mkarnicki: my first guess was wrong, the code doing reflection was ok | 22:06 |
mkarnicki | aha | 22:06 |
verterok | mkarnicki: the type of the argument of all the handle_* methods was wrong | 22:06 |
mkarnicki | that's what you wrote in the email though. | 22:06 |
mkarnicki | right | 22:07 |
verterok | mkarnicki: I changed the signature of all the handle_* methods and passed the correct type to the callbacks, and added a test case for nodeState case | 22:07 |
verterok | mkarnicki: I need to add tests for all the notifications, and write the code to actually handle them | 22:07 |
mkarnicki | verterok: when GSoC is over, and you have some time to guide me, maybe I'll be able to do some work for you | 22:08 |
mkarnicki | verterok: make sure you didn't leave your token in the source, I think you did. | 22:08 |
verterok | really? | 22:08 |
verterok | again? | 22:08 |
mkarnicki | should have written that on priv, sorry.. | 22:08 |
mkarnicki | I dont' know if its yours or mine | 22:09 |
mkarnicki | I'm looking on bzr diff | 22:09 |
verterok | mkarnicki: on which class? | 22:09 |
mkarnicki | OIOExampleClient.. no, date is old 2010-07-13 | 22:09 |
verterok | ah, ok | 22:09 |
mkarnicki | perhaps it's mine, sorry for confusion. | 22:09 |
verterok | yes, the code is clean here | 22:10 |
verterok | no tokens | 22:10 |
mkarnicki | verterok: hmm.. if I did pull bzr, shouldn't it overwrite my changes? like, the code I pasted you sent me today | 22:10 |
verterok | no | 22:11 |
mkarnicki | verterok: you're back to those 2 lines with reflection, right? | 22:11 |
verterok | mkarnicki: if you have changes in file changed upstream, bzr pull will mark it as in conflict | 22:11 |
verterok | yes | 22:11 |
mkarnicki | oh, ok. I'll fix it then. | 22:11 |
mkarnicki | verterok: thanks, you saved me again | 22:12 |
verterok | np | 22:12 |
mkarnicki | just don't say np xD I'm bugging you all the time ;) | 22:12 |
mkarnicki | I'm glad you're so helpful | 22:12 |
* mkarnicki gives high five to verterok | 22:12 | |
verterok | mkarnicki: hahaha, really, no problem. happy to help :) | 22:13 |
mkarnicki | :) | 22:13 |
=== dendrobates is now known as dendro-afk | ||
=== teknico_away is now known as teknico | ||
tehgary | honk | 23:29 |
tehgary | (I've never felt more silly requesting help, btw ;) ) | 23:30 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!