/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: John Arbash Meinel
  • Date: 2006-06-16 21:05:03 UTC
  • mfrom: (1784 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1785.
  • Revision ID: john@arbash-meinel.com-20060616210503-3d6f8d1e9a6ca5b4
[merge] bzr.dev 1784, fix NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
386
386
        self.bound_branch = self.branch
387
387
        self.master_branch.lock_write()
388
388
        self.master_locked = True
389
 
####        
390
 
####        # Check to see if we have any pending merges. If we do
391
 
####        # those need to be pushed into the master branch
392
 
####        pending_merges = self.work_tree.pending_merges()
393
 
####        if pending_merges:
394
 
####            for revision_id in pending_merges:
395
 
####                self.master_branch.repository.fetch(self.bound_branch.repository,
396
 
####                                                    revision_id=revision_id)
397
389
 
398
390
    def _cleanup(self):
399
391
        """Cleanup any open locks, progress bars etc."""
452
444
        """Record the parents of a merge for merge detection."""
453
445
        # TODO: Make sure that this list doesn't contain duplicate 
454
446
        # entries and the order is preserved when doing this.
455
 
        pending_merges = self.work_tree.pending_merges()
456
 
        self.parents = []
 
447
        self.parents = self.work_tree.get_parent_ids()
457
448
        self.parent_invs = []
458
 
        precursor_id = self.branch.last_revision()
459
 
        if precursor_id:
460
 
            self.parents.append(precursor_id)
461
 
        self.parents += pending_merges
462
449
        for revision in self.parents:
463
450
            if self.branch.repository.has_revision(revision):
464
451
                inventory = self.branch.repository.get_inventory(revision)