On 2010-12-20 15:15, Daniel Chen wrote:
On Mon, Dec 20, 2010 at 7:37 AM, David Henningsson
<david.hennings...@canonical.com> wrote:
Hey, I hope I didn't screw anything up when I boldly merged it myself,
I think the diff for the changelog looks a little weird for my revision.
Would any of you be able to check it for me? Thanks!
Sorry, I'm just getting to this now due to resource constraints.
No problem.
It
looks like your original merge proposal clobbered a bunch of
debian/changelog entries. AFAICT your intended fix only touches
debian/pulse-alsa.conf, so the rest of the merge is bogus. You'll
want to revert the debian/changelog hunks then manually apply your
debian/changelog hunk.
I hope I have managed to restore it now. At least "bzr diff --revision
326" looks reasonable. Thanks for checking!
--
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-audio-dev
Post to : ubuntu-audio-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-audio-dev
More help : https://help.launchpad.net/ListHelp
