← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-31 00:51:34 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051231005134-dd54e393c7d3b612
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
303
303
        # TODO: jam 20051230 Consider a special error for the case
304
304
        #       where the local branch is bound, and can't access the
305
305
        #       master branch
306
 
        self.master_branch = self.branch.get_bound_branch()
 
306
        self.master_branch = self.branch.get_master_branch()
307
307
        if not self.master_branch:
308
308
            return
309
309