"Doing on-the-fly conversion from RepositoryFormat2a() to RepositoryFormatKnitPack1()." lies, and fails

[Paul Sladen]

Doing:

  bzr branch lp:humanity humanity
  bzr branch lp:elementaryicons elementaryicons
  cd humanity
  bzr merge ../elementaryicons

Generates:

  Doing on-the-fly conversion from RepositoryFormat2a() to RepositoryFormatKnitPack1().
  This may take some time. Upgrade the repositories to the same format for better performance.
  bzr: ERROR: KnitPackRepository('file:///home/sladen/h2/humanity/humanity/.bzr/repository/')
  is not compatible with
  CHKInventoryRepository('file:///home/sladen/h2/humanity/elementaryicons/.bzr/repository/')
  different rich-root support

Ideally (in order of preference), Bzr should:

  (a.) not fail
  (b.) not lie about doing "on-the-fly conversion", if it can't follow-through
  (c.) give the user instructions/guidance (a work-around) if the above aren't possible.

[Martin Pool (mbp)]

The short story is that you should upgrade both related branches to format 2a.

  duplicate 272425