merge-package should be a branch hook
Bug #910900 reported by
Jelmer Vernooij
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Medium
|
Jelmer Vernooij | ||
Bug Description
"bzr merge-package" should be a merge hook inside of "bzr merge" rather than a separate command. There is no reason this functionality shouldn't be available by default, and it makes the UI simpler (and there's no need to discover a new command).
Having it be a part of 'bzr merge' will also mean that we don't have to implement all functionality that's currently present in cmd_merge (such as saving the merge location, bug #486075)
bzr 2.5 will provide the hooks required for this.
Related branches
lp:~jelmer/bzr-builddeb/merge-package-as-hook
- James Westby: Approve
-
Diff: 239 lines (+77/-37)8 files modified__init__.py (+23/-0)
cmds.py (+13/-0)
debian/NEWS (+8/-1)
debian/changelog (+3/-1)
errors.py (+1/-1)
merge_package.py (+4/-12)
tests/blackbox/test_merge_package.py (+25/-0)
tests/test_merge_package.py (+0/-22)
| description: | updated |
| Changed in bzr-builddeb: | |
| status: | In Progress → Fix Committed |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
