[Merge] lp:~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623 into lp:ubuntu/libwebsockets

[Roger Light]

> I'm still seeing this issue. Maybe you can try to run these steps locally as
> well?

I see the same thing, but nothing I've tried has been able to remove the conflicts. The file conflicts are only those files that have quilt patches. The patches are applied in the bzr repo. I have tried removing the patches, committing and then carrying out merge-upstream. That doesn't work. I've tried merge-upstream with the patches applied, that doesn't work. I've tried removing the contents of the .pc directory, so quilt doesn't think the patches are applied. This means when I run merge-upstream I need to resolve conflicts immediately. Having done that, I still get text conflicts when I try to merge back to the clean branch (no surprise really). I've tried to manually apply the updated upstream source, which works ok but then when I try to merge back bzr tells me the tree transform is malformed.

I think it's out of time now, thanks for looking anyway.
-- 
https://code.launchpad.net/~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623/+merge/249969
Your team Ubuntu branches is subscribed to branch lp:ubuntu/libwebsockets.