lp:~jameinel/bzr-builddeb/changelog-hook

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb

James Westby: Approve on 2010-02-02

Diff: 453 lines (+411/-2)

4 files modified

__init__.py (+20/-2)
merge_changelog.py (+262/-0)
tests/__init__.py (+1/-0)
tests/test_merge_changelog.py (+128/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #160521: specific merge algorithm for changelogs

Medium

Fix Released

Link a bug report

Related blueprints

408. By Vincent Ladeuil on 2010-01-29

Raise ImportError if we're not running at least bzr-2.1.0rc2.

407. By Vincent Ladeuil on 2010-01-29

Use the shiny merge.ConfigurableFileMerger.

This requires bzr-2.1but makes it even easier to define the per-file
merge hooks.

Test updated accordingly.

406. By Vincent Ladeuil on 2010-01-29

Get fixes from trunk

405. By John A Meinel on 2010-01-28

Change over to using a list of filenames as the enablement.

Default to enabling the plugin for 'debian/changelog' only.

404. By John A Meinel on 2010-01-28

Remove my win32 hacks to the test suite.

403. By John A Meinel on 2010-01-28

Add tests that the changelog hook functionality works as expected.

402. By John A Meinel on 2010-01-28

Remove the bits of code that were only used when running interactively

rather than as a merge function.

401. By John A Meinel on 2010-01-28

Note a limitation of the merge_changelog code.

400. By John A Meinel on 2010-01-28

use a helper, and assert that the merge algo is symmetric.

399. By John A Meinel on 2010-01-28

Add a direct test that merge_changelog has the behavior we expect.