/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Parth Malwankar
  • Date: 2010-03-03 14:55:44 UTC
  • mfrom: (5074 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5092.
  • Revision ID: parth.malwankar@gmail.com-20100303145544-1fwse4q2nv2alxoh
merged trunk. resolved conflict in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
36
36
    )
37
37
import bzrlib.branch
38
38
from bzrlib.errors import (NotBranchError,
 
39
                           NoColocatedBranchSupport,
39
40
                           UnknownFormatError,
40
41
                           UnsupportedFormatError,
41
42
                           )
206
207
        """See BzrDir.open_repository."""
207
208
        return SampleRepository(self)
208
209
 
209
 
    def create_branch(self):
 
210
    def create_branch(self, name=None):
210
211
        """See BzrDir.create_branch."""
 
212
        if name is not None:
 
213
            raise NoColocatedBranchSupport(self)
211
214
        return SampleBranch(self)
212
215
 
213
216
    def create_workingtree(self):