"bzr merge" should mention when it is using a custom merger
Bug #897313 reported by
Jelmer Vernooij
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/
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Medium |
To post a comment you must log in.
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.