/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/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2008-08-31 10:51:07 UTC
  • mfrom: (3668 +trunk)
  • mto: (3668.3.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3671.
  • Revision ID: v.ladeuil+lp@free.fr-20080831105107-kfmrr44gizyp6ckf
merge bzr.dev@3668

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
679
679
    @needs_read_lock
680
680
    def sprout(self, to_bzrdir, revision_id=None):
681
681
        """Create a new line of development from the branch, into to_bzrdir.
682
 
        
 
682
 
 
683
        to_bzrdir controls the branch format.
 
684
 
683
685
        revision_id: if not None, the revision history in the new branch will
684
686
                     be truncated to end with revision_id.
685
687
        """
686
 
        result = self._format.initialize(to_bzrdir)
 
688
        result = to_bzrdir.create_branch()
687
689
        self.copy_content_into(result, revision_id=revision_id)
688
690
        result.set_parent(self.bzrdir.root_transport.base)
689
691
        return result
703
705
        """
704
706
        if revision_id == _mod_revision.NULL_REVISION:
705
707
            new_history = []
706
 
        new_history = self.revision_history()
 
708
        else:
 
709
            new_history = self.revision_history()
707
710
        if revision_id is not None and new_history != []:
708
711
            try:
709
712
                new_history = new_history[:new_history.index(revision_id) + 1]