/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: Canonical.com Patch Queue Manager
  • Date: 2007-12-21 16:13:17 UTC
  • mfrom: (3113.6.8 bzr.ab2)
  • Revision ID: pqm@pqm.ubuntu.com-20071221161317-zdipotctmw8p1yhx
Fix commit for a checkout sharing a repo with its branch (abentley, #177592)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
381
381
            # Upload revision data to the master.
382
382
            # this will propagate merged revisions too if needed.
383
383
            if self.bound_branch:
384
 
                self._set_progress_stage("Uploading data to master branch")
385
 
                self.master_branch.repository.fetch(self.branch.repository,
386
 
                                                    revision_id=self.rev_id)
 
384
                if not self.master_branch.repository.has_same_location(
 
385
                        self.branch.repository):
 
386
                    self._set_progress_stage("Uploading data to master branch")
 
387
                    self.master_branch.repository.fetch(self.branch.repository,
 
388
                        revision_id=self.rev_id)
387
389
                # now the master has the revision data
388
390
                # 'commit' to the master first so a timeout here causes the
389
391
                # local branch to be out of date