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

  • Committer: Robert Collins
  • Date: 2007-02-02 09:17:23 UTC
  • mfrom: (2249.4.2 tip.info)
  • mto: This revision was merged to the branch mainline in revision 2257.
  • Revision ID: robertc@robertcollins.net-20070202091723-xtak1zzhe2ylwksa
(robertc) Merge new Branch.last_revision_info method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
428
428
        #       to local.
429
429
        
430
430
        # Make sure the local branch is identical to the master
431
 
        master_rh = self.master_branch.revision_history()
432
 
        local_rh = self.branch.revision_history()
433
 
        if local_rh != master_rh:
 
431
        master_info = self.master_branch.last_revision_info()
 
432
        local_info = self.branch.last_revision_info()
 
433
        if local_info != master_info:
434
434
            raise errors.BoundBranchOutOfDate(self.branch,
435
435
                    self.master_branch)
436
436