/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: Aaron Bentley
  • Date: 2007-02-09 07:16:20 UTC
  • mfrom: (2272 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
Merge from 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
431
432
        #       to local.
432
433
        
433
434
        # Make sure the local branch is identical to the master
434
 
        master_rh = self.master_branch.revision_history()
435
 
        local_rh = self.branch.revision_history()
436
 
        if local_rh != master_rh:
 
435
        master_info = self.master_branch.last_revision_info()
 
436
        local_info = self.branch.last_revision_info()
 
437
        if local_info != master_info:
437
438
            raise errors.BoundBranchOutOfDate(self.branch,
438
439
                    self.master_branch)
439
440
 
563
564
        for path, new_ie in entries:
564
565
            self._emit_progress_update()
565
566
            file_id = new_ie.file_id
 
567
            try:
 
568
                kind = self.work_tree.kind(file_id)
 
569
                if kind != new_ie.kind:
 
570
                    new_ie = inventory.make_entry(kind, new_ie.name,
 
571
                                                  new_ie.parent_id, file_id)
 
572
            except errors.NoSuchFile:
 
573
                pass
566
574
            # mutter('check %s {%s}', path, file_id)
567
575
            if (not self.specific_files or 
568
576
                is_inside_or_parent_of_any(self.specific_files, path)):