[07:08] good morning [07:16] Howdy. === Neo31` is now known as Neo31 === \b is now known as benonsoftware [08:56] dholbach: good morning. sorry about the e-mail, I thought it'd be OK to CC you as you sponsored the package in Ubuntu last time :) [08:57] ESphynx, no need to block on me for something like this :) [08:57] dholbach: the way I see it you get things done whereas it could have sat there for months otherwise :P [08:58] but I'll file a launchpad bug next time is what you're saying I should do? and subscritebe ubuntu-sponsors? [08:58] for the future: just file a sync request or sponsorship bug and if nothing happens, ping me about it [08:58] thanks [08:58] yes [08:58] k, thanks. it's a bugfix release only so technically it should still be OK past FF [08:59] it's uploaded now :) [09:00] awesome. thanks. [12:16] hello === med_` is now known as medberry === medberry is now known as medberry2 === dholbach_ is now known as dholbach [17:17] I'm a bit confused. I've done: bzr branch lp:ubuntu/libwebsockets ; cd libwebsockets ; bzr merge-upstream ; bzr ci [17:17] If I then branch a separate copy of lp:ubuntu/libwebsockets and try and merge in my modified branch, I get text conflicts. [17:18] Shouldn't the second step effectively be identical to doing a merge-upstream? I don't see why there is a conflict. [17:18] Any suggestions? [17:19] (I have to dash off now, but will be able to respond a bit later) [18:34] It's something to do with quilt patches, but if I do the merge-upstream with patches applied (as they are in the previous commit), or if I remove the patches, commit and then carry out merge-upstream then I still get conflicts when I try to merge the modified branch into the clean branch. === medberry2 is now known as med_ [23:15] Howdy. It's getting toward the end of the day, thus FF. Can someone sponsor my update in the queue for xiphos? Thanks if you can.