0.13: Bzr is frozen. Can't escape from a conflicted state.

[Jari Aalto]

I'm having serious trouble (using 0.13). See below. Donät know how this happened exactly, but
I seem to have hosed bzr into frozen state where I cannot break the "conflict" to move on.

Please advice.

Jari

1)
  $ bzr st
  removed:
    debian/dlume.xpm
  added:
    debian/dlume.xpm
  modified:
    config.guess
    config.sub
    debian/debian-vars.mk
    debian/debian.mk
    debian/rules
  conflicts:
    Conflict adding file debian/rules.BASE.  Moved existing file to debian/rules.BASE.moved.
    Conflict adding file debian/rules.OTHER.  Moved existing file to debian/rules.OTHER.moved.
    Conflict adding file debian/rules.THIS.  Moved existing file to debian/rules.THIS.moved.
  pending merges:
    jari.aalto at cante.net 2006-12-22 - UU not needed for *.zpm
      jari.aalto at cante.net 2006-12-22 - update
      jari.aalto at cante.net 2006-12-22 - update
      jari.aalto at cante.net 2006-12-22 - dlume.xpm.uuencoded
      jari.aalto at cante.net 2006-12-22 - uudecode fix
      jari.aalto at cante.net 2006-12-22 - uuencode
    jari.aalto at cante.net 2006-12-22 - typo: debian-vars.mk

2)
  $ ls -la
  total 61
  drwxr-xr-x 2 root root  416 2006-12-22 01:09 .
  drwxr-xr-x 6 root root  776 2006-12-22 00:41 ..
  -rw-r--r-- 1 root root 1748 2006-12-21 18:33 changelog
  -rw-r--r-- 1 root root    2 2006-12-21 16:10 compat
  -rw-r--r-- 1 root root  716 2006-12-21 18:41 control
  -rw-r--r-- 1 root root 1552 2006-12-21 16:10 copyright
  -rw-r--r-- 1 root root 4775 2006-12-22 00:41 debian.mk
  -rw-r--r-- 1 root root  329 2006-12-22 00:41 debian-vars.mk
  -rw-r--r-- 1 root root   17 2006-12-21 16:10 dirs
  -rw-r--r-- 1 root root  219 2006-12-21 17:01 dlume.desktop
  -rw-r--r-- 1 root root 7653 2006-12-22 00:50 dlume.xpm
  -rw-r--r-- 1 root root   17 2006-12-21 16:10 docs
  -rw-r--r-- 1 root root  147 2006-12-21 17:03 menu
  -rw-r--r-- 1 root root  333 2006-12-21 16:10 README.Debian
  -rwxr-xr-x 1 root root 2995 2006-12-22 00:44 rules

3)
  $ bzr resolved rules
  debian/rules is not conflicted

4)
  $ bzr st
  removed:
    debian/dlume.xpm
  added:
    debian/dlume.xpm
  modified:
    config.guess
    config.sub
    debian/debian-vars.mk
    debian/debian.mk
    debian/rules
  conflicts:
    Conflict adding file debian/rules.BASE.  Moved existing file to debian/rules.BASE.moved.
    Conflict adding file debian/rules.OTHER.  Moved existing file to debian/rules.OTHER.moved.
    Conflict adding file debian/rules.THIS.  Moved existing file to debian/rules.THIS.moved.
  pending merges:
    jari.aalto at cante.net 2006-12-22 - UU not needed for *.zpm
      jari.aalto at cante.net 2006-12-22 - update
      jari.aalto at cante.net 2006-12-22 - update
      jari.aalto at cante.net 2006-12-22 - dlume.xpm.uuencoded
      jari.aalto at cante.net 2006-12-22 - uudecode fix
      jari.aalto at cante.net 2006-12-22 - uuencode
    jari.aalto at cante.net 2006-12-22 - typo: debian-vars.mk