[03:01] <lfaraone> chrisccoulson: you said earlier I can't call Sugar's Firefox.activity Firefox. If I depend on abrowser-branding, though, it'll prevent the browser used outside of sugar from being called Firefox. Can I just use the  abrowser branding inside sugar and not at current?
[03:01] <lfaraone> *not elsewhere?
[03:01] <lfaraone> (Mozilla has not been repsonsive for my request for a trademark clarification, and I'm not sure who else to ask)
[09:04] <fta2> doh!
[09:04] <fta2> 2010-09-24 linux/stable (6.0.472.62 -> 6.0.472.63)
[09:04] <fta2> 2010-09-24 linux/beta (6.0.472.62 -> 6.0.472.63)
[09:04] <fta2> 2010-09-24 linux/dev (7.0.517.8 -> 7.0.517.13)
[09:04] <fta2> lots of merging to do :P
[10:18] <chrisccoulson> hi lfaraone. sorry, could you mail me the exact details of what you want to do (i was asleep when you messaged me)
[12:17] <bdrung_> chrisccoulson: after the ubufox update: when visiting about:home, i get this error message: The requested URL /10.10/Debian PTS/ was not found on this server.
[12:20] <bdrung_> chrisccoulson: about:home seems to be bundled to the search plugin (selecting google as search plugin works)
[14:01] <chrisccoulson> bdrung_, yeah, that's intentional - we select a URL based on the current search plugin
[14:01] <chrisccoulson> and has always been like that
[14:02] <chrisccoulson> i suspect the server needs a redirect
[14:02] <chrisccoulson> bdrung_, ok, i will ping OLS about that
[14:08] <chrisccoulson> bdrung_, ok, that's going to be fixed on the server
[14:08] <chrisccoulson> sorry about that
[14:49] <cyphermox> chrisccoulson (or anybody else if you know), was there a reason why the cairo included in seamonkey can't be used? Looking at the same bug on openSUSE they may have been able to fix the RenderBadPicture issue that way --- I will test anyway
[14:52] <chrisccoulson> cyphermox, i don't there is anything that would stop us switching to in-tree cairo
[14:52] <cyphermox> right
[14:52] <cyphermox> chrisccoulson, know when micahg usually shows up?
[14:53] <chrisccoulson> he's not back online until tomorrow i think
[14:53] <cyphermox> ok. well anyway, I see the change he had done wasn't really relevant to a bug or not (looking through the commits changing debian/rules for the cairo ver)
[14:54] <chrisccoulson> oh, did he work on it already?
[14:57] <cyphermox> chrisccoulson, nah, it was a commit from april
[14:58] <cyphermox> he *is* assigned to the bug though, so I'll change that
[15:01] <chrisccoulson> i'll owe you a beer if you can figure this one out :-)
[15:01] <chrisccoulson> have you used xtrace before?
[15:02] <cyphermox> nope
[15:03] <chrisccoulson> ah, xtrace is useful for debugging issues like this
[15:03] <cyphermox> oh, looks like this might fix it for maverick, but maybe not for lucid... will have to look harder
[15:03] <chrisccoulson> eg, i used it last week for tracking down gnome bug 630163
[15:03] <ubot2> Gnome bug 630163 in general "gnome-terminal crashed with signal 5 in _XError() when Mutter is restarted" [Normal,Resolved: fixed] http://bugzilla.gnome.org/show_bug.cgi?id=630163
[15:03] <cyphermox> cool
[15:04] <chrisccoulson> it's quite a handy tool
[15:04] <cyphermox> thx for the pointer. do you have a link to documentation?
[15:05] <chrisccoulson> i'm not sure there's much documentation. it's just a case of running it like "xtrace -d :0 -D :9", and then running the application you want to debug with "DISPLAY=:9.0"
[15:05] <chrisccoulson> it basically creates a fake x server, which just proxies all the protocol calls to the real server
[15:05] <cyphermox> ok
[15:06] <cyphermox> well yeah otoh, I should have thought of it, it's just tracing calls :)
[15:06] <cyphermox> I'll give it a shot once seamonkey has done compiling here
[15:06] <chrisccoulson> the good thing is that you get a lot of historical data that is difficult to get in GDB
[15:07] <cyphermox> nothing like hysterical data :)
[15:07] <chrisccoulson> lol :)
[15:25] <cyphermox> chrisccoulson, did you try reproducing the issue in bug 575160?
[15:25] <ubot2> Launchpad bug 575160 in seamonkey (Ubuntu Maverick) (and 2 other projects) "seamonkey 2.0 crashes with 'RenderBadPicture' diagnostics (affects: 19) (dups: 4) (heat: 125)" [High,Triaged] https://launchpad.net/bugs/575160
[15:25] <chrisccoulson> cyphermox, yeah, but i could never make it crash
[15:25] <chrisccoulson> did you get it to crash yet?
[15:25] <cyphermox> ah, drat
[15:25] <cyphermox> yup
[15:25] <cyphermox> I was able to make it crash everytime on google image search :)
[15:26] <chrisccoulson> oh, cool!
[16:58] <cyphermox> chrisccoulson, could you take a look at https://code.edge.launchpad.net/~mathieu-tl/seamonkey/lp575160/+merge/36555 ?
[16:58] <chrisccoulson> cyphermox, sure, will take a look in a bit
[16:59] <cyphermox> sure, no rush ;)
[17:17] <chrisccoulson> cyphermox, i'm not sure how busy you are, but i just noticed that the firefox 3.6 daily builds are failing on hardy
[17:18] <chrisccoulson> https://edge.launchpad.net/~ubuntu-mozilla-daily/+archive/ppa/+packages
[17:18] <chrisccoulson> i've not looked at why just yet
[17:18] <chrisccoulson> but those are fairly important, as we support 3.6 on hardy, and that might indicate we'll have an issue with the next security update
[17:54] <lfaraone> chrisccoulson: mailed.
[17:54] <chrisccoulson> lfaraone, thanks
[17:54] <lfaraone> chrisccoulson: it's more of a logistical / political issue than a technical I think.
[18:06] <cyphermox> chrisccoulson, yeah I can look at it, sure
[18:39] <chrisccoulson> w00t, lightning is in the archive again \o/
[18:47] <cyphermox> sweet!
[18:54] <cyphermox> i think the wiki pages for the team needs an update, at least as a pointer, e.g. that you need mercurial, bzr, etc. to be installed to be able to do stuff with the branches.
[20:38] <chrisccoulson> fta - huh? https://edge.launchpad.net/~towolf/+archive/crack/+build/1973089
[20:38] <fta> chrisccoulson, i know :( iirc, he's adding a patch
[20:39] <chrisccoulson> fta - ah, ok. what does the patch do?
[20:42] <fta> debian/patches/a_few_customized_shortcuts.patch
[20:45] <fta> chrisccoulson, http://paste.ubuntu.com/499917/
[20:48] <fta> not something we want, it's more a matter of personal choices
[20:50] <fta> bug 646991
[20:50] <ubot2> Launchpad bug 646991 in chromium-browser (Ubuntu) "chromium-browser segfaults after install of moonlight-plugin-chromium (affects: 1) (heat: 6)" [Undecided,New] https://launchpad.net/bugs/646991
[20:51] <fta> didn't even know there was a specific moonlight plugin for chromium
[20:51] <chrisccoulson> fta - that plugin also makes firefox crash
[20:52] <fta> could you please comment in that bug?
[20:54] <chrisccoulson> fta - i've reassigned
[20:54] <chrisccoulson> the firefox crash is weird. it actually crashes in the openjdk plugin when moonlight is installed
[20:54] <chrisccoulson> but it crashes in getenv, so i suspect the moonlight plugin has some memory errors
[21:01] <BUGabundo> fta chromium is botked
[21:01] <BUGabundo> 0x00007ffff1141b2d in write () at ../sysdeps/unix/syscall-template.S:82
[21:01] <fta> not much of a usable trace
[21:03] <BUGabundo> installing gdb packages now
[21:03] <BUGabundo> 26% [1 chromium-browser-dbg 32889557/123MB 26%]                                                                                371kB/s 4min 2s
[21:03] <BUGabundo> it takes a while
[21:08] <fta> with the last update, all my favicons are gone
[21:12] <BUGabundo> fta http://paste.ubuntu.com/499936/
[21:24] <fta> doing what?
[21:26] <BUGabundo> noting special at all
[21:27] <BUGabundo> just browsing the usual sites
[21:41] <fta> BUGabundo, not known upstream, could you please file a bug?
[21:41] <fta> upgrading my netbook...
[21:41] <fta> 602 upgraded, 15 newly installed, 1 to remove and 0 not upgraded.
[21:41] <fta> Need to get 898MB of archives.
[21:42] <BUGabundo> ehe
[21:44] <BUGabundo> fta http://code.google.com/p/chromium/issues/detail?id=56852
[21:48] <fta> you filed 2 ?
[21:49] <BUGabundo> fta no. one and its know http://code.google.com/p/chromium/issues/detail?id=56851
[21:49] <BUGabundo> erk
[21:49] <BUGabundo> its mine
[21:49] <BUGabundo> wtf
[21:50] <BUGabundo> google messed up
[22:25] <fta> lol, http://arstechnica.com/microsoft/news/2010/09/bill-gates-staring-back-at-you-from-outlook-2010.ars


[01:30] <HoloIRCUser> Have a nice year
[01:53] <BoomerBile> anyone know how to repair the boot sector after installing a dual boot with windows?
[01:54] <HoloIRCUser> Happy year evbody
[09:07] <shiggitay> hey all... I'm trying to make an initramfs image for my tablet to boot from an SD card... I have found this: https://help.ubuntu.com/community/BootFromSD but I'm not running a *buntu OS. I'm running Funtoo Linux. I"m sure the fundamentals are the same, but how would I go about settiing it up right?
[09:36] <shiggitay> anyone?
[09:36] <shiggitay> Okay new question: where can I get the deb installer for initramfs-tools?
[13:16] <Voyage> Hi, Is there ANY RELIABLE screen capture software like windows has? I have tried kazoom and many.
[13:54] <mparillo> Voyage: I have used knsapshot and I have not seen if fail, so it is reliable in my experience. Is it missing a key feature for you?
[13:56] <ramchandra> ksnapshot works well for me
[14:16] <BluesKaj_> Happy New Year everyone!
[14:46] <ramchandra> oh new year for americans
[14:46] <ramchandra> that's why
[14:46] <ramchandra> (and south americans)
[14:47] <BluesKaj_> and Canadians and Europeans and Russians etc etc
[16:41] <xt_> Good day everyone, first time here :)
[16:42] <monkeyjuice> hello xt_
[16:48] <xt_> hello monkeyjuice :) Does Canonical resume support kubuntu again? Haven't check back at kubuntu site for a long time,
[16:50] <monkeyjuice> Kubuntu was sponsored by Canonical Ltd. until 2012, and thereafter by Blue Systems. During the changeover, Kubuntu retained the use of Ubuntu project servers and existing developers
[16:51] <monkeyjuice> thats from http://en.wikipedia.org/wiki/Kubuntu
[16:52] <xt_> thx  ; P
[17:08] <iwar> hi
[17:08] <monkeyjuice> hello iwar
[17:08] <xt_> hello iwar
[17:08] <BluesKaj_> the3 cheif Kubunty developer was laid off by Canonical and hired by Blue Systems , he  hangs out in #kubuntu-devel as Riddell, aka Jonathan Riddell
[17:09] <Guest18878> my upgrade form 14.04 to 14.10 failed I've got the dvd and
[17:09] <monkeyjuice> happy new year BluesKaj_
[17:09] <Guest18878> need help to recover the failed upgrade , what I see is kernel failed error
[17:09] <BluesKaj_> hey monkeyjuice, Happy New Year to you too ! :)
[17:10] <iwar> how configure tor whit vidalia?
[17:10] <BluesKaj_> Guest18878, make sure 14.04 LTS only upgrade is disabled in the package manager
[17:14] <iwar> a link of guide to configure tor whit vidalia in kubuntu
[17:17] <xt_> BluesKaj_ , thx that's good to know
[17:24] <xt_> iwar, I only tried Tor browser bundle before, but it should be the same no matter on ubuntu or kubuntu, link https://www.torproject.org/projects/vidalia.html.en
[17:29] <G_Daniels> Hi. I do have strange problem on my kubuntu 14.10 with the "Recently Installed" menu. It is displayed stretched and distorted for reasons unknown.
[17:30] <iwar> ok thanks, but kubuntu doesn't open tor browser bundle, it doesn't read the program.
[17:31] <BluesKaj_> G_Daniels, Recently Installed?
[17:32] <G_Daniels> Yes, the menu in the classic view
[17:33] <G_Daniels> Its distorted and stretched fully over entire desktop
[17:33] <iwar> daniel first the install kubuntu, how SO had you?
[17:34] <iwar> becouse i had ubuntu and i too have the problem of storage
[17:34] <G_Daniels> how did you solve it?
[17:34] <G_Daniels> this looks obviously like some menu drawing bug to me
[17:35] <monkeyjuice> G_Daniels:  this is a fresh install?
[17:36] <G_Daniels> its a 3 day old install with additional applications installed on it. the entire system has been updated to the latest packages available
[17:37] <iwar> i don't understand your problem? is a problem of storege or a bug whit a program in directory?
[17:37] <iwar> !*
[17:38] <BluesKaj_> bbl
[17:39] <G_Daniels> neither is it a storage nor a directory problem. the "Recently installed" submenues from the kde application launcher are totally streteched over the entire visible screen. you only can see the first menu row fully stretched over the entire screen
[17:40] <G_Daniels> others are not visible, only the first row and its fully stetched
[17:40] <iwar> change the risoluction
[17:41] <iwar> of the program
[17:41] <G_Daniels> already tried to change the res. didnt made any difference
[17:42] <iwar> i have kubuntu from 25, now open the program that create a problem at you
[17:44] <iwar> kde doesn't create problem at me
[17:46] <iwar> friends how install java ?
[17:50] <G_Daniels> @iwar - apt-get install default-jre
[17:50] <iwar> thanks
[17:53] <iwar> how unistall java and tor
[17:53] <iwar> apt-get remove?
[17:56] <BluesKaj_> iwar, yes
[17:57] <iwar> thanks
[17:57] <BluesKaj_> you should keep the default java app tho
[18:01] <iwar> what???
[18:03] <BluesKaj_> iwar, java-common etc
[18:04] <iwar> ok
[20:45] <thor77> can anyone confirm a "TP-Link WN725N v2" (https://wikidevi.com/wiki/TP-LINK_TL-WN725N_v2) will work with kubuntu?
[20:49] <BluesKaj> thor77, I use a TP-WDR3600 router, and it works great as most TP-Link devices do on Linux
[20:50] <thor77> BluesKaj: i cant get this stick working on archlinux -> i will have to switch to another one :/
[20:50] <thor77> but, uhm, i will try the live-cd
[20:52] <BluesKaj> the kubuntu/ubiquity installer should have no problem with ethernet or wifi with that router
[20:54] <BluesKaj> thor77, I'm a bit confused here, hang on.
[21:00] <BluesKaj> thor77, sorry, I misread, so it's a usb dongle
[21:00] <thor77> BluesKaj: yes
[21:04] <BluesKaj> thor77, here's a tutorial, http://brilliantlyeasy.com/ubuntu-linux-tl-wn725n-tp-link-version-2-wifi-driver-install/
[21:05] <thor77> BluesKaj: this tutorial only installs the driver, thats now in the kernel, manually
[21:08] <noah> hello, i've reinstalled becouse i wanted to change unity.  i've intalled kubuntu keeping my home folder. After installationg KDE doesn't load.  Does any body know why_ thanks
[21:09] <BluesKaj> thor77, then network manager should recognize the kernel module , did you run,  ip add in the trerminal. or ifconfig ?
[21:10] <thor77> BluesKaj: "iw dev" and "ifconfig" doesnt show the interface, but "iwconfig" does
[21:13] <BluesKaj> ok iwconfig still works on kubuntus up to 14.04, then run ifup wlan0, then sudo dhclient wlan0
[21:15] <BluesKaj> thor77, ^
[21:16] <BluesKaj> thor77, then you should see network manager list the wifi signal
[21:21] <estacado> Hi anybody using kodi on kubuntu?
[21:25] <estacado> Anybody?
[21:26] <BluesKaj> estacado, what's kodi, not listed in the package manager
[21:31] <estacado> hi any using kodi?
[21:38] <thor77> blubberbop: which package includes ifup?
[21:39] <thor77> oh, wrong highlight..
[21:39] <thor77> sry


[00:39] <AuroraBorealis> is anyone here this time? third time is the charm? =/
[00:40] <bob2> best to ask'n'idle
[00:40] <bob2> (or try the list)
[00:40] <AuroraBorealis> ive been doing that for the past 3 days haha
[00:49] <bignose> AuroraBorealis: such a long wait would motivate me to join the mailing list and ask there.
[00:50] <AuroraBorealis> it seems like such a stupid problem to begin with i dunno if any mailing list would help me
[00:50] <AuroraBorealis> the program (bzr explorer) works but it just hangs on 'starting'
[00:51] <AuroraBorealis> but i may try that. i hate windows :<
[01:41] <IbIro> Hey
[14:36]  * jelmer waves
[14:44]  * bialix waves back
[14:48] <bialix> vila: ^-D
[14:48] <bialix> vila: :-D
[14:48] <vila> bialix: Isn't it nice when people just ping you for a smile :D
[14:49] <bialix> I'm reading your mail
[14:49] <vila> bialix: by the way, I'm about to announce 2.4b2 (I'm very late for that already), any news about the windows installers ?
[14:50] <bialix> no news from Gary unfortunately :-(
[14:50] <bialix> I've sent him a mail, but have no response
[14:50] <vila> ok, thanks for the feedback anyway
[14:50] <bialix> I'll try to hack existing 2.4b1 installer and make something like 2.4b2. but only tomorrow or on monday
[14:51] <bialix> btw, this monday is big holiday: Victory day
[14:51] <bialix> and 1 year passed since we met at uds
[14:52] <vila> bialix: Happy birthday !
[14:52] <bialix> ?
[14:52] <bialix> I'm puzzled
[14:52] <vila> bialix: 1 year since we met physically ;)
[14:52] <bialix> yea
[14:53] <bialix> sorry for the bottle
[14:53] <vila> hehe
[14:54] <bialix> vila: I'm going to add FEATURES dictionary to qbzr. As the way to get other code (e.g. bzr-explorer) to know that some features exists in the installed version of qbzr
[14:54] <bialix> do you think this can be interested for bzr?
[14:54] <bialix> if so I'll send my thoughts to list, or we just can talk here
[14:55] <bialix> and side joke: Marius has shown me very good band, they have nice song about PPA: http://www.youtube.com/watch?v=xjCsBK55X9Y :-)
[14:55] <vila> bialix: as a way to formalize getattr(module, 'function/method', None) ?
[14:56] <bialix> vila: sort of
[14:56] <bialix> some methods get new arguments and this can be important
[14:57] <vila> PPA, nice music...
[14:57] <bialix> so, inspecting FEATURES dictionary external code can see whether required feature present (new code, new arguments, etc) and work accordingly
[14:57] <bialix> Tamacun is very nice too
[14:58] <vila> I'm +-0 there,
[14:58] <vila> it seems we tried many variants without really achieving the desired result,
[14:59] <bialix> well, version number does not work if new feature has landed in the middle of the cycle
[14:59] <vila> well, I can live with that
[14:59] <bialix> there was discussion about versioning API, but it'' become hell very soon, IMO
[15:00] <bialix> okay, then I won't worry to spam the list
[15:01] <vila> bialix: on the contrary, my remark was more to tell you I don't feel like the good public for this discussion, but it's still an open subject worth discussing
[15:01] <bialix> ok, I see
[15:02] <bialix> I'll try to dogfood it inside qbzr for some time, and if I'll have some godd result then will present to the bzr MKL
[15:02] <bialix> ML
[15:03] <vila> sounds like a good plan
[15:32] <bialix> vila: I've just realized that my features dict is like hard-coded config in qzbr. I'm not sure yet what it'll imply
[15:34] <vila> well, it better stays hard-coded no ? If only to avoid highly confusing errors if the code and an external config file become out-of-sync
[15:40] <bialix> yep, it's hard-coded. but it looks like a config
[15:44] <bialix> vila: http://groups.google.com/group/qbzr/browse_thread/thread/d26bcb73fb3c6b9 maybe this explanation will be better
[15:45] <vila> bialix: hehe, yeah, you get the idea, configs are just dicts :)
[15:45] <bialix> vila: :-)
[15:45] <vila> bialix: and... I'm pretty sure there are ways to make read-only dicts in python (so you'll have to worry a bit less about people breaking stuff there)
[15:47] <bialix> vila: I don't remember off hands, in the future I may change it to use special class
[15:53] <poolie> vila, hi
[15:53] <poolie> great mail :)
[15:54] <vila> glad you liked it, I was inspired yesterday evening but had to stop as V. was waiting ;)
[15:55] <vila> poolie: I think spiv found the right metrics there too so that was fun to write around them
[15:58] <poolie> :)
[16:02]  * bialix waves at poolie
[16:02] <poolie> hi there bialix
[16:03] <bialix> have you seen Budapest? I haven't been there, but my mother has, and she said it's nice  city
[16:03] <poolie> i have a little
[16:03] <poolie> i might go out for a walk later today
[16:03] <bialix> :-)
[16:03] <poolie> it's very green and pleasant now
[16:04] <poolie> http://www.flickr.com/photos/mbp_/5692151369/in/photostream
[16:04] <bialix> hope there's no snow ;-)
[16:09] <poolie> not exactly
[16:12] <bialix> vila: if you have 5 minutes, please update version number on bazaar.canonical.com
[16:13] <bialix> it's really should be automatic stuff
[16:13] <vila> bialix: rhaaaaa, thanks for the heads-up
[16:16] <vila> bialix: fixed
[16:16] <bialix> :-)
[16:16] <vila> bialix: as in: fixed in source and pushed, the site will be updated ... by a cron job but I don't remember the frequency
[16:17]  * bialix nods
[16:17] <vila> poolie: woooow, now that's some nice place...
[16:43] <poolie> vila,  that's not actually where i'm staying ;)
[16:44] <vila> hehe, yeah, I figured ;) But still, nice stones
[17:14]  * jelmer waves
[17:15] <BlindWolf8> Hello all
[17:16] <BlindWolf8> I am having an issue with Bazaar 2.3.1
[17:16] <BlindWolf8> Can anyone here help me with it?
[17:17] <jelmer> hi BlindWolf8
[17:17] <jelmer> BlindWolf8: Please ask your question, if there's somebody who knows what the problem is they can answer
[17:17] <BlindWolf8> Hi!
[17:17] <BlindWolf8> OH great!
[17:18] <BlindWolf8> I am in the middle of something, so it's important that I get an answer quickly
[17:18] <BlindWolf8> I have a server which is Linux, it's running Bazaar 2.3.1
[17:18] <BlindWolf8> and so are all my clients
[17:18] <BlindWolf8> When I commit a file that is around 37 MB or so, bazar doesn't commit the file...it stops with an error message
[17:19] <BlindWolf8> The mesage is "unexpected end of message"
[17:20] <BlindWolf8> I'm using the bzr+ssh protocol
[17:20] <BlindWolf8> everyone has bound branches
[17:20] <jelmer> it's reproducible oin all clients?
[17:21] <BlindWolf8> i have reproduced the issue on my computer as well as another client
[17:24] <BlindWolf8> Any help is appreciated
[17:25] <BlindWolf8> I've tried changing timeouts, etc. on sshd on the server, but no luck
[17:25] <BlindWolf8> I am able to commit the file localy
[17:25] <BlindWolf8> and it's one particular file
[17:25] <BlindWolf8> *not one
[17:25] <BlindWolf8> any file that seems to be over or close to that size causes said issue
[17:29] <jelmer> please file
[17:30] <jelmer> please file a bug about this - I don't have any immediate ideas but other developers might, there usually aren't a lot of people around in the weekend though
[17:30] <jelmer> we're certainly aware of problems with big files - but that's usually files that are a couple of hundred megabytes, not 37Mb
[17:38] <BlindWolf8> Thanks!
[17:43] <cbz> jelmer: what version of bzr-svn do you want me to retry the svn import with?
[17:44] <cbz> jelmer: i've got bzr 2.3.1 installed and am using the default there
[17:45] <cbz> jelmer: looks like 1.0.5
[17:53] <jelmer> cbz: bzr-svn trunk
[17:54] <jelmer> cbz: Ah, you're using the Mac installer? I think that uses a bzr-svn snapshot from a while ago
[17:56] <cbz> windows installer
[17:56] <cbz> okay, will retry
[18:08] <ScottK> jelmer: Will you be at UDS this time?
[18:08] <jelmer> ScottK: Yep, poolie and I are both attending
[18:09] <ScottK> Great.  I will see you there then.
[18:09] <jelmer> cool :)
[18:09] <ScottK> Watch out for this new guy you got on rotation from the disto team.
[18:09] <ScottK> ;-)
[18:20] <jelmer> :)
[19:15] <rsingh> hello everyone
[19:16] <rsingh> question: when i push my code to the server, now i have various statements like <<<<< TREE in some of my docs, and i'm wondering how to remove them, as I'm new to bzr and the push/pull functionality
[19:21] <rsingh> anyone?
[19:28] <jelmer> hi rsingh
[19:28] <jelmer> rsingh: those<<< markers are the indication of conflicts during pull/update/merge
[19:29] <jelmer> it happens because the person you pulled from had a different change to the same lines as you did
[19:31] <jelmer> time to catch my train, back later
[19:39] <rsingh> belated thanks, jelmer