bzr merge should handle patches
Bug #373719 reported by
Jelmer Vernooij
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Breezy |
Triaged
|
Medium
|
Jelmer Vernooij | ||
Bug Description
it would be nice if 'bzr merge' could deal with plain patches better. At the moment it will skip patches and attempt to open for merging the parent directories in which they're present, leading to confusing errors.
The 'easy' fix would be to just error out if a patch is specified and hint the user at the 'bzr patch' or 'patch' commands.
Alternatively, it would be really neat if it could DWIM and merge the patch into the working tree, but not adding any pending merges (as they're not known).
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: check-for-breezy |
| tags: | removed: check-for-breezy |
| Changed in brz: | |
| status: | New → Triaged |
| importance: | Undecided → Medium |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| milestone: | none → 3.1.0 |
To post a comment you must log in.
I agree, that would be good.
When you file a bug yourself, please set the priority and status too, to reduce roundtrips...