lp:~spiv/bzr-builddeb/use-dpkg-mergechangelogs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 596

Jelmer Vernooij: Approve (code) on 2011-07-22

Diff: 438 lines (+167/-161)

4 files modified

README (+5/-0)
debian/changelog (+10/-1)
merge_changelog.py (+60/-116)
tests/test_merge_changelog.py (+92/-44)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #517090: 3-way changelog file merge doesn't support deletions	Medium	Fix Released
Bug #517093: 3-way changelog file merge doesn't do textual merging on sections	High	Fix Released
Bug #552950: Additional changelog entries are modified when merging another branch	Medium	Fix Released
Bug #718944: bzr-builddeb merge sorts the changelog by version order, rather than preserving existing ordering	High	Fix Released

Link a bug report

Related blueprints

586. By Andrew Bennetts on 2011-07-25

Update debian/changelog.

585. By Andrew Bennetts on 2011-07-25

Workaround bug 815700 in dpkg-mergechangelogs (it emits slightly non-standard conflict markers), and link to bug 815704 in an XXX comment in a test.

584. By Andrew Bennetts on 2011-07-22

Update tests for different (but mostly better) behaviour provided by using dpkg-mergechangelogs.

583. By Andrew Bennetts on 2011-07-22

Merge lp:bzr-builddeb.

582. By Andrew Bennetts on 2011-07-05

Quick hack to use dpkg-mergechangelogs.

581. By Jelmer Vernooij on 2011-06-28

Merge part 5 of support for multiple upstream tarballs.

580. By Jelmer Vernooij on 2011-06-28

Merge moving of upstream tag functionality to upstream/pristinetar.

579. By Jelmer Vernooij on 2011-06-28

Merge support for lzma.

578. By Jelmer Vernooij on 2011-06-26

Merge removal of unnecessary directory.

577. By Jelmer Vernooij on 2011-06-24

Fix a missing import of the util module.