Impossible to resolve conflict

[Steve Franks]

On Fri, Dec 17, 2010 at 9:06 AM, Steve Franks <bahamasfranks at gmail.com> wrote:
> Looks like I did a global/top-level add in a tree that had a conflict,
> only the files aren't actually there anymore.  I have to say, bzr's
> conflict resolution infrastructure is **highly inefficient** compared
> to cvs!  I suppose it's trying to be extra safe in some way?  I like
> the fact that I haven't corrupted a binary file since I switched, but
> I haven't achieved an efficient workflow yet, either.  In cvs you just
> edited and committed, and no more conflict, there was no dropping to
> the command line and typing in really long file names manually,
> deleting files, cut & paste, etc.  I feel like a real 'hacker' now
> with all the files I've been 'hacking' up.  Plus the whole tree is
> locked from committing, not just the one file.  I understand the
> benefits of having an atomic commit to a whole tree, but locking it
> out when there's a conflict!?  I'm stuck.  I'm going to wind up
> emailing files back and forth between systems until I get this
> fixed...as usual...
>
>
> ...(I suppose I could blow away the repository and start with a fresh
> one, but that seems like a total cop-out, not to mention a couple gigs
> still takes a long time over DSL)....
>
>
> [steve at fyre /usr/home/steve/projects]$ bzr status
> modified:
>  ZongeHoursFranks.gnumeric.xml
> conflicts:
>  Conflict adding file ZongeHoursFranks.gnumeric.xml.BASE.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.BASE.moved.
>  Conflict adding file ZongeHoursFranks.gnumeric.xml.OTHER.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.OTHER.moved.
>  Conflict adding file ZongeHoursFranks.gnumeric.xml.THIS.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.THIS.moved.
> [steve at fyre /usr/home/steve/projects]$ bzr conflicts
> Conflict adding file ZongeHoursFranks.gnumeric.xml.BASE.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.BASE.moved.
> Conflict adding file ZongeHoursFranks.gnumeric.xml.OTHER.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.OTHER.moved.
> Conflict adding file ZongeHoursFranks.gnumeric.xml.THIS.  Moved
> existing file to ZongeHoursFranks.gnumeric.xml.THIS.moved.
> [steve at fyre /usr/home/steve/projects]$ bzr resolve
> ZongeHoursFranks.gnumeric.xml.BASE
> ZongeHoursFranks.gnumeric.xml.BASE does not exist
> [steve at fyre /usr/home/steve/projects]$ bzr resolve
> ZongeHoursFranks.gnumeric.xml.OTHER
> ZongeHoursFranks.gnumeric.xml.OTHER does not exist
> [steve at fyre /usr/home/steve/projects]$ bzr resolve
> ZongeHoursFranks.gnumeric.xml.THIS
> ZongeHoursFranks.gnumeric.xml.THIS does not exist
> [steve at fyre /usr/home/steve/projects]$
>

Incidentally, I deleted the aforementioned conflicting files from the
file, .bzr/checkout/conflicts, and voila, problem solved.  That sounds
like a bug, but I'm a hardware jockey, so I'll reserve judgment and
keep hacking up those text files as needed.

Steve