[07:08] <dholbach> good morning
[07:16] <Unit193> Howdy.
[08:56] <ESphynx> 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] <dholbach> ESphynx, no need to block on me for something like this :)
[08:57] <ESphynx> dholbach: the way I see it you get things done whereas it could have sat there for months otherwise :P
[08:58] <ESphynx> but I'll file a launchpad bug next time is what you're saying I should do? and subscritebe ubuntu-sponsors?
[08:58] <dholbach> for the future: just file a sync request or sponsorship bug and if nothing happens, ping me about it
[08:58] <dholbach> thanks
[08:58] <dholbach> yes
[08:58] <ESphynx> k, thanks. it's a bugfix release only so technically it should still be OK past FF
[08:59] <dholbach> it's uploaded now :)
[09:00] <ESphynx> awesome. thanks.
[12:16] <sou> hello
[17:17] <ral> I'm a bit confused. I've done: bzr branch lp:ubuntu/libwebsockets ; cd libwebsockets ; bzr merge-upstream ; bzr ci
[17:17] <ral> 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] <ral> Shouldn't the second step effectively be identical to doing a merge-upstream? I don't see why there is a conflict.
[17:18] <ral> Any suggestions?
[17:19] <ral> (I have to dash off now, but will be able to respond a bit later)
[18:34] <ral> 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.
[23:15] <Unit193> 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.