/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: Jelmer Vernooij
  • Date: 2011-04-16 15:01:57 UTC
  • mfrom: (5791 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5800.
  • Revision ID: jelmer@samba.org-20110416150157-5rgye9nnc8tic098
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
699
699
 
700
700
    def get_commit_builder(self, parents, config=None, timestamp=None,
701
701
                           timezone=None, committer=None, revprops=None,
702
 
                           revision_id=None):
 
702
                           revision_id=None, lossy=False):
703
703
        """Obtain a CommitBuilder for this branch.
704
704
 
705
705
        :param parents: Revision ids of the parents of the new revision.
709
709
        :param committer: Optional committer to set for commit.
710
710
        :param revprops: Optional dictionary of revision properties.
711
711
        :param revision_id: Optional revision id.
 
712
        :param lossy: Whether to discard data that can not be natively
 
713
            represented, when pushing to a foreign VCS 
712
714
        """
713
715
 
714
716
        if config is None:
715
717
            config = self.get_config()
716
718
 
717
719
        return self.repository.get_commit_builder(self, parents, config,
718
 
            timestamp, timezone, committer, revprops, revision_id)
 
720
            timestamp, timezone, committer, revprops, revision_id,
 
721
            lossy)
719
722
 
720
723
    def get_master_branch(self, possible_transports=None):
721
724
        """Return the branch we are bound to.