← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-10 00:21:11 UTC
  • mto: (1558.16.3 revert-missing)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: jelmer@samba.org-20060610002111-ff582d7ee2090037
Fix some types (found using aspell).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
316
316
            # revision data is in the local branch now.
317
317
            
318
318
            # upload revision data to the master.
319
 
            # this will propogate merged revisions too if needed.
 
319
            # this will propagate merged revisions too if needed.
320
320
            if self.bound_branch:
321
321
                self.master_branch.repository.fetch(self.branch.repository,
322
322
                                                    revision_id=self.rev_id)
532
532
 
533
533
            self.builder.record_entry_contents(ie, self.parent_invs, 
534
534
                path, self.work_tree)
535
 
            # describe the nature of the change that has occured relative to
 
535
            # describe the nature of the change that has occurred relative to
536
536
            # the basis inventory.
537
537
            if (self.basis_inv.has_id(ie.file_id)):
538
538
                basis_ie = self.basis_inv[ie.file_id]