*** This bug is a duplicate of bug 788000 *** https://bugs.launchpad.net/bugs/788000
Additionally, bug #688101 (also available in bzr-2.4 but fixed after #788000) had fixed the last known case where multiple conflicts were related to the same file (which was the root cause of failures when 'bzr resolve' was called for more than one conflict). -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/826637 Title: bzr crashed with KeyError in get_tree_parent(): 'new-2' after `bzr resolve --take-other --all` To manage notifications about this bug go to: https://bugs.launchpad.net/bzr/+bug/826637/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs