← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
543
543
                    stacked=stacked)
544
544
        return result
545
545
 
546
 
 
547
 
 
548
546
    @staticmethod
549
547
    def create_branch_convenience(base, force_new_repo=False,
550
548
                                  force_new_tree=None, format=None,
1147
1145
        """See BzrDir.can_convert_format()."""
1148
1146
        return True
1149
1147
 
1150
 
    def create_branch(self, name=None, repository=None):
 
1148
    def create_branch(self, name=None, repository=None,
 
1149
            append_revisions_only=None):
1151
1150
        """See BzrDir.create_branch."""
1152
1151
        return self._format.get_branch_format().initialize(self, name=name,
1153
 
                repository=repository)
 
1152
                repository=repository,
 
1153
                append_revisions_only=append_revisions_only)
1154
1154
 
1155
1155
    def destroy_branch(self, name=None):
1156
1156
        """See BzrDir.create_branch."""