← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Ian Clatworthy
  • Date: 2009-06-16 12:22:20 UTC
  • mfrom: (4416.6.1 bzr-220067)
  • mto: This revision was merged to the branch mainline in revision 4447.
  • Revision ID: ian.clatworthy@canonical.com-20090616122220-k1ye45pbu5zylltt
(igc) better message when split fails (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4675
4675
        try:
4676
4676
            containing_tree.extract(sub_id)
4677
4677
        except errors.RootNotRich:
4678
 
            raise errors.UpgradeRequired(containing_tree.branch.base)
 
4678
            raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
4679
4679
 
4680
4680
 
4681
4681
class cmd_merge_directive(Command):