← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Aaron Bentley
  • Date: 2006-06-12 02:11:45 UTC
  • mfrom: (1759.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: aaron.bentley@utoronto.ca-20060612021145-0ced20f7791f3c66
Fix some typos (found using aspell) (Jelmer Vernooij).

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)
411
411
            except Exception, e:
412
412
                found_exception = e
413
413
        if found_exception is not None: 
414
 
            # dont do a plan raise, because the last exception may have been
 
414
            # don't do a plan raise, because the last exception may have been
415
415
            # trashed, e is our sure-to-work exception even though it loses the
416
416
            # full traceback. XXX: RBC 20060421 perhaps we could check the
417
417
            # exc_info and if its the same one do a plain raise otherwise 
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]