"bzr merge" should mention when it is using a custom merger

Bug #897313 reported by Jelmer Vernooij
14
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned
Breezy
Triaged
Medium
Unassigned

Bug Description

bzr merge already outputs which files it is merging. It would be nice if it could indicate when it is using custom merge hooks, so that the user can appropriately disable these hooks or recognize that they aren't being used.

E.g. something like

$ bzr merge lp:bzr
 M bzrlib/remote.py
 M doc/en/release-notes/bzr-2.5.txt (using news_merge)

Tags: merge ui
Revision history for this message
Vincent Ladeuil (vila) wrote :

Additionally, the po_merge plugin has a related issue as it involves another file (the .pot file when merging a .po file).

This should not block addressing the common case but addressing both would be nice.

Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
tags: removed: check-for-breezy
Changed in brz:
status: New → Triaged
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

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