"Unknown kind 'relocated'" error merging after reverting unversioned parent conflict
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Breezy |
Triaged
|
Medium
|
Unassigned |
Bug Description
I have a local branch of bzr+ssh:
Finally I realized I could just do bzr revert, which gave a clean status. I did rm -rf apidoc (the conflicting unversioned directory) and bzr merge again. Oops:
File "/usr/lib/
create_
File "/usr/lib/
raise AssertionError(
AssertionError: Unknown kind 'relocated'
I'm attaching the whole .bzr.log. bzr status:
Standalone tree (format: rich-root-pack)
Location:
branch root: .
Related branches:
push branch: bzr+ssh:
parent branch: bzr+ssh://<email address hidden>
summary: |
- error merging after reverting unversioned parent conflict + "Unknown kind 'relocated'" error merging after reverting unversioned + parent conflict |
tags: | added: merge treetransform |
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Medium |
Follow-ups: bzr check runs clean on the repository: //home/ kcarnold/ csc/divisi/ '. //home/ kcarnold/ csc/divisi/ '. transport. local.LocalTran sport url=file: ///home/ kcarnold/ csc/divisi/ > format <RepositoryForm atKnitPack4> //home/ kcarnold/ csc/divisi/ '. /home/kcarnold/ csc/divisi/ format Bazaar Branch Format 6 (bzr 0.15)
Checking working tree at 'file:/
Checking repository at 'file:/
checked repository <bzrlib.
240 revisions
676 file-ids
1208 unique file texts
36795 repeated file texts
0 unreferenced text versions
Checking branch at 'file:/
checked branch file://
I'm attaching what should be the full sequence of commands I ran on the repo (from my bash history).