lca doesn't report delete + change as conflict
Bug #235441 reported by
mhosken
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Breezy |
Triaged
|
Medium
|
Unassigned | ||
Bug Description
In the developer documentation on the LCA merge algorithm it describes a difference between LCA and merge3 whereby LCA does not report that delete + change is a conflict. It also states that reporting it this way is a core value for the LCA algorithm (See section Algorithm point 3). Are there plans to fix this in LCA (or weave for that matter)?
Revision history for this message
| Aaron Bentley (abentley) wrote Re: [Bug 235441] [NEW] lca doesn't report delete + change as conflict | #1 |
| Changed in bzr: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
| importance: | Low → Medium |
| tags: | added: merge |
| 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.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mhosken wrote:
> Public bug reported:
>
> In the developer documentation on the LCA merge algorithm it describes a
> difference between LCA and merge3 whereby LCA does not report that
> delete + change is a conflict. It also states that reporting it this way
> is a core value for the LCA algorithm
It's a conceptual bug in LCA. It's not considered desirable.
> (See section Algorithm point 3).
> Are there plans to fix this in LCA (or weave for that matter)?
Not yet. First we have figure out the right way to tweak the algorithm
to make it do what we want. The two options that present themselves are:
- - Make it actually based on a merge3 merger
- - Make it an edge-based merger
Both are fairly significant changes.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFIPdvB0F+
1HiS7XPnMKF8p+
=OPmN
-----END PGP SIGNATURE-----