bzr resolve --take-this fails to rename file.THIS to file on ContentConflict
Bug #529968 reported by
Vincent Ladeuil
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
High
|
Vincent Ladeuil | ||
Bug Description
Discovered while translating the associated blacbox test to a more precise whitebox one.
Related branches
lp://staging/~vila/bzr/integration
- Vincent Ladeuil: Approve
-
Diff: 31 lines (+4/-4)2 files modifiedbzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)
| Changed in bzr: | |
| status: | Confirmed → In Progress |
| Changed in bzr: | |
| assignee: | nobody → Vincent Ladeuil (vila) |
| tags: | added: conflicts |
| Changed in bzr: | |
| milestone: | none → 2.2.0b1 |
| status: | In Progress → Fix Released |
To post a comment you must log in.
