merge-upstream should allow specifying merge algorithm
Bug #310694 reported by
Jelmer Vernooij
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Low
|
James Westby | ||
Bug Description
affects bzr-builddeb
At least when merging from an upstream branch, it is useful to be able
to specify the merge algorithm (e.g. --lca in case of a criss-cross
merge).
--
Jelmer Vernooij <email address hidden> - http://
Jabber: <email address hidden>
Related branches
lp:~james-w/bzr-builddeb/2.1
(Merged)
| Changed in bzr-builddeb: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
Revision history for this message
| James Westby (james-w) wrote | #1 |
| Changed in bzr-builddeb: | |
| milestone: | none → 2.1 |
| status: | Confirmed → Fix Committed |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
| Changed in bzr-builddeb: | |
| assignee: | nobody → James Westby (james-w) |
To post a comment you must log in.
Done in 2.1. Will merge to trunk later.
Thanks,
James