bzr switch has moved one of my files to .THIS and wants to add it to the branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
Scenario:
/branch/checkout is a checkout of a remote branch
/branch/
"Reports/
I have a lightweight-
I decide to work on a different document.
$ bzr branch /branch/checkout /branch/
$ bzr switch /branch/
I then get this error:
Conflict: can't delete Reports/
Conflict because Reports/
Contents conflict in Reports/
Updated to revision [NUM]
Switched to branch: /branch/
I then edit a file without resolving the conflict (I think I didn't notice them): Bibliography/
$ bzr ci
bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.
$ bzr st
added:
Reports/
Reports/
modified:
Bibliography/
unknown:
Reports/
conflicts:
Conflict: can't delete Reports/
Conflict because Reports/
Contents conflict in Reports/
I have no idea what has happened here, but there seem to be several problems:
1. "Reports/
2. "Reports/
3. "Reports/
Changed in bzr: | |
status: | New → Confirmed |
tags: | added: conflicts |
Changed in bzr: | |
importance: | Undecided → Medium |
tags: | added: switch |
tags: | added: check-for-breezy |
The relevant parts of ~/.bzr.log do not appear informative, but here they are.