How do I fix bzr mu resulting in lots of conflicts?

I can't run bzr mu on mutter without a lot of conflicts. I worked around this the last time I updated mutter by copying in the release tarball contents but it happened again with this update. So I was hoping the bzr experts could help me understand what I should do (or fix this if there's a bug).

======

$ bzr branch ubuntu:mutter test
Most recent Ubuntu version: 3.1.90.1-0ubuntu1
Packaging branch status: CURRENT
Branched 28 revision(s).
$ cd test/
$ quilt pop -a
Removing patch 03_link_gles2.patch
Restoring src/Makefile.am
Restoring src/Makefile.in

Removing patch 01_Wcast-align.patch
Restoring configure.in

No patches applied
$ bzr commit
Committing to: /home/jeremy/devel/mutter/test/
modified configure.in
missing .pc/01_Wcast-align.patch
modified .pc/01_Wcast-align.patch
missing .pc/03_link_gles2.patch
modified .pc/03_link_gles2.patch
missing .pc/applied-patches
modified .pc/applied-patches
missing .pc/01_Wcast-align.patch/configure.in
modified .pc/01_Wcast-align.patch/configure.in
missing .pc/03_link_gles2.patch/src
modified .pc/03_link_gles2.patch/src
missing .pc/03_link_gles2.patch/src/Makefile.am
modified .pc/03_link_gles2.patch/src/Makefile.am
missing .pc/03_link_gles2.patch/src/Makefile.in
modified .pc/03_link_gles2.patch/src/Makefile.in
modified src/Makefile.am
modified src/Makefile.in
Committed revision 29.
jeremy@MobileThought:~/devel/mutter/test$ bzr mu
Using distribution oneiric
Using version string 3.1.92.
Using uscan to look for the upstream tarball.
mutter: Version (3.1.92) available on remote site:
  http://ftp.gnome.org/pub/GNOME/sources/mutter/3.1/mutter-3.1.92.tar.bz2
  (local version is 3.1.92)
mutter: Successfully downloaded updated package mutter-3.1.92.tar.bz2
    and renamed it as mutter_3.1.92.orig.tar.bz2
Committing to: /home/jeremy/devel/mutter/tmphXUL0k/upstream/
modified NEWS
modified configure
modified configure.in
modified po/be.po
modified po/ca.po
modified po/da.po
modified po/en_GB.po
modified po/es.po
modified po/fr.po
modified po/id.po
modified po/it.po
modified po/ja.po
modified po/lv.po
modified po/pl.po
modified po/pt.po
modified po/sl.po
modified po/ta.po
modified po/uk.po
modified po/zh_HK.po
modified po/zh_TW.po
modified src/compositor/compositor.c
modified src/compositor/meta-shaped-texture.c
modified src/compositor/meta-window-actor.c
modified src/compositor/meta-window-group.c
modified src/core/display-private.h
modified src/core/display.c
modified src/core/screen-private.h
modified src/core/screen.c
modified src/core/util.c
modified src/core/window-private.h
modified src/core/window.c
modified src/meta/display.h
modified src/ui/frames.c
modified src/ui/theme-private.h
modified src/ui/theme.c
Committed revision 12.
Contents conflict in NEWS
Conflict adding files to NEWS. Moved to root.
Conflict adding files to NEWS.BASE. Moved to root.
Conflict adding files to NEWS.OTHER. Moved to root.
Contents conflict in configure
Conflict adding files to configure. Moved to root.
Conflict adding files to configure.BASE. Moved to root.
Conflict adding files to configure.OTHER. Moved to root.
Contents conflict in configure.in
Conflict adding files to configure.in. Moved to root.
Conflict adding files to configure.in.BASE. Moved to root.
Conflict adding files to configure.in.OTHER. Moved to root.
Conflict adding files to po. Moved to root.
Conflict adding files to po. Created directory.
Conflict because po is not versioned, but has versioned children. Versioned directory.
Conflict adding file po. Moved existing file to po.moved.
Contents conflict in po/be.po
Contents conflict in po/ca.po
Contents conflict in po/da.po
Contents conflict in po/en_GB.po
Contents conflict in po/es.po
Contents conflict in po/fr.po
Contents conflict in po/id.po
Contents conflict in po/it.po
Contents conflict in po/ja.po
Contents conflict in po/lv.po
Contents conflict in po/pl.po
Contents conflict in po/pt.po
Contents conflict in po/sl.po
Contents conflict in po/ta.po
Contents conflict in po/uk.po
Contents conflict in po/zh_HK.po
Contents conflict in po/zh_TW.po
Conflict adding files to src. Created directory.
Conflict adding files to src. Moved to root.
Conflict because src is not versioned, but has versioned children. Versioned directory.
Conflict adding file src. Moved existing file to src.moved.
Conflict adding files to src/compositor. Created directory.
Conflict because src/compositor is not versioned, but has versioned children. Versioned directory.
Contents conflict in src/compositor/compositor.c
Conflict adding files to src/core. Created directory.
Conflict because src/core is not versioned, but has versioned children. Versioned directory.
Contents conflict in src/core/display-private.h
Contents conflict in src/core/display.c
Contents conflict in src/core/screen-private.h
Contents conflict in src/core/screen.c
Contents conflict in src/core/util.c
Contents conflict in src/core/window-private.h
Contents conflict in src/core/window.c
Conflict adding files to src/ui. Created directory.
Conflict because src/ui is not versioned, but has versioned children. Versioned directory.
Contents conflict in src/ui/frames.c
Contents conflict in src/ui/theme.c
53 conflicts encountered.
The new upstream version has been imported.
You should now resolve the conflicts, review the changes, and then commit.