← 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: 2007-02-07 03:09:58 UTC
  • mfrom: (2268 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2269.
  • Revision ID: aaron.bentley@utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
58
58
 
59
59
from bzrlib import (
60
60
    errors,
 
61
    inventory,
61
62
    tree,
62
63
    )
63
64
import bzrlib.config
428
429
        #       to local.
429
430
        
430
431
        # 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:
 
432
        master_info = self.master_branch.last_revision_info()
 
433
        local_info = self.branch.last_revision_info()
 
434
        if local_info != master_info:
434
435
            raise errors.BoundBranchOutOfDate(self.branch,
435
436
                    self.master_branch)
436
437
 
560
561
        for path, new_ie in entries:
561
562
            self._emit_progress_update()
562
563
            file_id = new_ie.file_id
 
564
            try:
 
565
                kind = self.work_tree.kind(file_id)
 
566
                if kind != new_ie.kind:
 
567
                    new_ie = inventory.make_entry(kind, new_ie.name,
 
568
                                                  new_ie.parent_id, file_id)
 
569
            except errors.NoSuchFile:
 
570
                pass
563
571
            # mutter('check %s {%s}', path, file_id)
564
572
            if (not self.specific_files or 
565
573
                is_inside_or_parent_of_any(self.specific_files, path)):