"different rich-root support" error could be clearer

[Nazo]

using bzr 1.6 on Ubuntu intrepid
also fails on bzr.dev r3714

$ bzr branch -r 596 lp:bbs2ch
$ bzr merge -r39..40 lp:bbs2ch/0.4
bzr: ERROR: KnitPackRepository('file:///home/nazo/bug/.bzr/repository/')
is not compatible with
RemoteRepository(bzr+ssh://<email address hidden>/%7Ebbs2ch-bot/bbs2ch/0.4-mirror/.bzr/)
different rich-root support

[Jelmer Vernooij (jelmer)]

You need to make sure both branches are using a rich-root-format. You can do this by upgrading both to the rich-root-pack format, e.g. "bzr upgrade --rich-root-pack bzr+ssh://<email address hidden>/%7Ebbs2ch-bot/bbs2ch/0.4-mirror", "bzr upgrade --rich-root-pack .".

The error message from bzr could perhaps be a bit clearer.

[Nazo (lovesyao)]

Thank you for your reply.
I'm upgraded and it works with problem.

$ bzr merge -r39..40 lp:bbs2ch/0.4
+N defaults/
+N defaults/skin/
+N defaults/skin/popup.js.OTHER
R defaults/ => defaults.moved/
Conflict adding files to build. Moved to root.
Conflict adding files to chrome. Moved to root.
Conflict adding files to chrome.manifest. Moved to root.
Conflict adding files to components. Moved to root.
Conflict adding files to defaults. Moved to root.
Conflict adding files to defaults. Created directory.
Conflict because defaults is not versioned, but has versioned children. Versioned directory.
Conflict adding file defaults. Moved existing file to defaults.moved.
Conflict adding files to defaults/skin. Created directory.
Conflict because defaults/skin is not versioned, but has versioned children. Versioned directory.
Contents conflict in defaults/skin/popup.js
Conflict adding files to history.txt. Moved to root.
Conflict adding files to install.rdf. Moved to root.
13 conflicts encountered.
$

lp:bbs2ch was branched from lp:~vcs-imports/bbs2ch/trunk and I develop in this branch.
lp:~vcs-imports/bbs2ch/trunk is imported with VCS import from http://svn.sourceforge.jp/svnroot/bbs2ch/trunk/bbs2chreader .
lp:bbs2ch/0.4 is pushed from local branched with bzr-svn from http://svn.sourceforge.jp/svnroot/bbs2ch/branches/bbs2chreader/04_BRANCH/ .
http://svn.sourceforge.jp/svnroot/bbs2ch/branches/bbs2chreader/04_BRANCH/ seems to be branched with "svn cp" from http://svn.sourceforge.jp/svnroot/bbs2ch/trunk/bbs2chreader .