On 2010-12-02 18:52 +0100, Joey Hess wrote: > Package: dpkg-dev > Version: 1.15.8.6 > Severity: normal > File: /usr/bin/dpkg-mergechangelogs > > j...@gnu:~/src/tasksel>git stash apply > dpkg-mergechangelogs: warning: .merge_file_qmEqOI(l1365): bad key-value > after `;': `urgency=low ' > LINE: tasksel (2.50) unstable; urgency=low > dpkg-mergechangelogs: warning: .merge_file_QUd3Nf(l1366): bad key-value > after `;': `urgency=low ' > LINE: tasksel (2.50) unstable; urgency=low > dpkg-mergechangelogs: warning: .merge_file_4ONINM(l1369): bad key-value > after `;': `urgency=low ' > LINE: tasksel (2.50) unstable; urgency=low > Auto-merging debian/changelog > CONFLICT (content): Merge conflict in debian/changelog > > The changelog started with this: > > tasksel (2.87) UNRELEASED; urgency=low > > Perhaps it's really choking on the UNRELEASED?
No, it does not like the trailing space after "urgency=low" in the 2.50 entry. Sven -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
