/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-10-24 00:19:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2931.
  • Revision ID: robertc@robertcollins.net-20071024001931-d080vqc683qdsvvp
Correct the check_pointless change to pass all tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
422
422
            raise PointlessCommit()
423
423
        # If length == 1, then we only have the root entry. Which means
424
424
        # that there is no real difference (only the root could be different)
425
 
        if len(self.builder.new_inventory) != 1 and (self.any_entries_changed
426
 
            or self.any_entries_deleted):
 
425
        # unless deletes occured, in which case the length is irrelevant.
 
426
        if (self.any_entries_deleted or 
 
427
            (len(self.builder.new_inventory) != 1 and
 
428
             self.any_entries_changed)):
427
429
            return
428
430
        raise PointlessCommit()
429
431