That's really strange. Was dpush perhaps used from the local branch
before the update?
** Also affects: bzr
Importance: Undecided
Status: New
** Tags added: conflicts
--
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
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs