bzr commit fails to commit merges that change file kind

[Marius Gedminas]

bzr 0.15.0dev0 fails to commit a merge that includes file type changes (e.g. file to directory). See this mailing list thread for more context: https://lists.ubuntu.com/archives/bazaar/2007q1/022866.html

Steps to reproduce:
  mkdir branch1
  bzr init branch1
  touch branch1/file1
  bzr add branch1/file1
  bzr ci branch1 -m "add a file"
  bzr branch branch1 branch2
  rm branch1/file1
  mkdir branch1/file1
  bzr ci branch1 -m "replace file with directory"
  cd branch2
  bzr merge ../branch1
  bzr ci <-- fails with AssertionError:

  File "/home/mg/src/bzr.dev/bzrlib/inventory.py", line 212, in find_previous_heads
    assert candidates[ie.revision] == ie

James Westby created a failing unit test for this situation: https://lists.ubuntu.com/archives/bazaar/2007q1/022880.html

[Wouter van Heyst (larstiq)]

Still present in bzr.dev

[Martin Pool (mbp)]

Submitted for 0.15rc3

[John A Meinel (jameinel)]

This was actually fixed in bzr-0.15. But the Milestone drop-down only shows me 0.16... :(

Is it only showing "active" milestones now?