[Bug 805809] Re: merge fails with NoFinalPath

[Colin Watson]

** Also affects: bzr (Ubuntu Maverick)
   Importance: Undecided
       Status: New

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to bzr in Ubuntu.
https://bugs.launchpad.net/bugs/805809

Title:
  merge fails with NoFinalPath

Status in Bazaar Version Control System:
  Fix Released
Status in Bazaar 2.3 series:
  Fix Released
Status in Bazaar 2.4 series:
  Fix Released
Status in “bzr” package in Ubuntu:
  Fix Released
Status in “bzr” source package in Maverick:
  New
Status in “bzr” source package in Natty:
  Fix Released

Bug description:
  The context is a bit unclear and lead to 31 failures for the package
  importer.

  AFAICS after a first round of diagnosis, this is a regression
  introduced in 2.2 !

  It occurs when a PathConflict involves an item with the same file-id
  and the same name in two branches with different root-ids.

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/805809/+subscriptions