When merging two branches without common ancestry, Bazaar provides no means to map file IDs
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Breezy |
In Progress
|
High
|
Jelmer Vernooij | ||
Bug Description
Here's a scenario Bazaar should support:
* A user downloads Drupal 6.6, extracts it, and starts a project.
* The user runs bzr init, bzr add, and bzr commit to version control the project.
* The user needs to upgrade Drupal and discovers that a Bazaar branch exists for releases of Drupal core.
* The user merges from the foreign branch (specifying revnos the first time) to upgrade Drupal and create common ancestry.
* Future upgrade merges are easy.
Right now, doing this creates massive numbers of conflicts because the user's own branch and the foreign branch have different file IDs. Bazaar ought to allow a merge option that "merges in" the file IDs from the foreign branch if paths identify the unique files, which is the case when "merging in" a Drupal upgrade.
| Changed in bzr: | |
| status: | New → Confirmed |
| David Strauss (davidstrauss) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| tags: | added: merge |
| Martin Pool (mbp) wrote | #2 |
| tags: | added: check-for-breezy |
| Changed in brz: | |
| status: | New → Triaged |
| importance: | Undecided → High |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| status: | Triaged → In Progress |
| tags: | removed: check-for-breezy |
| Changed in brz: | |
| milestone: | none → 3.0.0 |
| Changed in brz: | |
| milestone: | 3.0.0 → 3.1.0 |
I've blogged about this issue:
http://