Internal error in bzr 1.5 when trying to resolve a conflict after rm'ing a directory.
Bug #244980 reported by
Christopher Burns
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
When trying to resolve a conflict, one file appeared to be in two states, both 'removed' and 'unknown' in the 'bzr stat'. I removed the file with 'bzr rm --force FILE', then removed the parent directory (also a conflict). The next 'bzr stat' produced an internal error.
Attached is a script to reproduce the error with the public launchpad branches, and a full traceback.
Thanks!
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: conflicts |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
To post a comment you must log in.
I found the correct way to resolve the conflict of this one file. bzr added the .THIS version of the file to the branch and I suspect my renaming and forced removed in the script was causing the fubar. That said, it seems odd that bzr added the .THIS to the branch, is this a bug? Not noticing this initially sent me on the wrong path.
Solution:
cburns@traits 12:34:21 $ bzr ls -v
? ctraits.c.BASE
V ctraits.c.THIS
cburns@traits 12:34:30 $ pwd cburns/ src/nipy- trunk/neuroimag ing/utils/ enthought/ traits
/Users/
cburns@traits 12:35:32 $ bzr rm ctraits.c.THIS utils/enthought /traits/ ctraits. c.THIS
deleted neuroimaging/
cburns@traits 12:36:40 $ bzr resolve ctraits.c
cburns@traits 12:36:48 $ cd ..
cburns@enthought 12:37:29 $ bzr ls -v
V traits/
cburns@enthought 12:37:37 $ bzr rm traits/ utils/enthought /traits
deleted neuroimaging/
cburns@enthought 12:37:48 $ bzr resolve traits