=== dkessel_ is now known as dkessel [22:27] Once a bug has been fixed on a local branch, should I attach a patch to the bug in Launchpad or submit a merge proposal to the original package? [22:28] okay19: either works. whether one is better than the other probably depends on what the maintainer of that package prefers [22:28] okay19: out of curiosity, which package are we taking about? [22:29] tarpman: apt, specifically bug 1309658 [22:29] bug 1309658 in apt (Ubuntu) "apt.conf man page should indicate # is also used for comments" [Medium,Triaged] https://launchpad.net/bugs/1309658 [22:47] Also, should merge proposals contain a patch file or modify the source directly? [22:50] okay19: that also depends on the package ;) in the case of your specific bug, I'd suggest attaching your patch to the bug: it looks to me like it's more likely to be integrated into apt upstream directly than to be carried as an ubuntu-specific change [22:51] okay19: as far as a merge proposal, https://code.launchpad.net/apt/+activereviews has a couple of existing ones you could use as examples