Bazaar

specific merge algorithm for changelogs

Bug #160521 reported by Martin Pool
4
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
Medium
Unassigned
bzr-builddeb
Fix Released
Medium
John A Meinel

Bug Description

Package changelogs tend to conflict badly. keybuk has some code to autoresolve them; it would be nice if this would run automatically.

This belongs in a plugin.

It could be done at the moment by registering a new merge algorithm and letting the user invoke it manually using remerge. But we should also have a hook by which that plugin can ask to merge files of that name.

Tags: udd

Related branches

lp:~jameinel/bzr-builddeb/changelog-hook
James Westby: Approve
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)
Martin Pool (mbp)
Changed in bzr:
importance: Undecided → Medium
status: New → Confirmed
Revision history for this message
James Westby (james-w) wrote : Re: [Bug 160521] specific merge algorithm for changelogs

On (06/11/07 16:39), Martin Pool wrote:
> Public bug reported:
>
> Package changelogs tend to conflict badly. keybuk has some code to
> autoresolve them; it would be nice if this would run automatically.
>
> This belongs in a plugin.

bzr-builddeb may be an appropriate place for this functionality.

Thanks,

James

--
  James Westby -- GPG Key ID: B577FE13 -- http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256

Revision history for this message
John A Meinel (jameinel) wrote :

I think it would be fine to put this in a plugin, and see Andrew's recent code about per-file merge plugins.

I'm just updating this with a 'udd' tag, since it would be quite useful for them.

tags: added: udd
Revision history for this message
John A Meinel (jameinel) wrote :

The code has landed to enable per-file hooks. We have a 'news_merge' plugin which is present in the 2.1.0rc1 release to use as an example of how to build a changelog merger.

There is a thread on UDD that mentions "Bryce's merge_changelog" script. It looks like we probably need to track that down and get it turned into a configurable merge hook.

Revision history for this message
John A Meinel (jameinel) wrote :

https://code.edge.launchpad.net/~jameinel/bzr-builddeb/changelog-hook/+merge/18192

I wrote such a hook for bzr-builddeb, currently under review.

Changed in bzr:
assignee: nobody → John A Meinel (jameinel)
status: Confirmed → In Progress
Changed in bzr-builddeb:
assignee: nobody → John A Meinel (jameinel)
importance: Undecided → Medium
status: New → In Progress
Revision history for this message
John A Meinel (jameinel) wrote :

This has now landed in bzr-builddeb, though it may still have some pending updates from myself. Still the request for a custom merge seems to have been fulfilled.

Changed in bzr-builddeb:
status: In Progress → Fix Released
Changed in bzr:
assignee: John A Meinel (jameinel) → nobody
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.