conflicts are reported too early - renames occur after the conflict
Bug #2524 reported by
Robert Collins
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Medium
|
Unassigned | ||
Bug Description
When doing a merge, if there is a conflict in the text of FOO.c, and it is later renamed to BAR.c, all the user sees is 'diff3 conflict in FOO.c', and then it is renamed later, so they don't know where to look for the conflict. Also, the OTHER, THIS and BASE files are not renamed with the file.
Revision history for this message
| Robert Collins (lifeless) wrote | #1 |
| Changed in bzr: | |
| status: | Unconfirmed → Fix Released |
To post a comment you must log in.
Closing because tree-transforms should have fixed this.