← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2007-09-20 07:59:48 UTC
  • mto: (2840.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2842.
  • Revision ID: robertc@robertcollins.net-20070920075948-6f32d46hr3oyw4zb
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
650
650
                    self.basis_tree):
651
651
                    self.entries_changed = True
652
652
 
653
 
        # note that deletes have occured
 
653
        # note that deletes have occurred
654
654
        if set(self.basis_inv._byid.keys()) - set(self.builder.new_inventory._byid.keys()):
655
655
            self.entries_deleted = True
656
656
        # Report what was deleted.
738
738
                local=self.local, reporter=self.reporter)
739
739
        except errors.PointlessCommit:
740
740
            pass
741
 
        else:
742
 
            self.entries_changed = True
743
741
 
744
742
    def _record_entry(self, path, file_id, specific_files, kind, name,
745
743
            parent_id, definitely_changed, existing_ie=None,