/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: 2005-12-31 05:57:13 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-20051231055713-351f8d30e4dc1a8f
Adding tests against an sftp branch.
Fixed a couple of errors it revealed.
Including that we were re-connecting to the master branch
multiple times, inside a write lock (because inside commit
we call pull, which needs the master branch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
310
310
        # If the master branch is bound, we must fail
311
311
        master_bound_location = self.master_branch.get_bound_location()
312
312
        if master_bound_location:
313
 
            raise CommitToDoubleBoundBranch(self.branch,
 
313
            raise errors.CommitToDoubleBoundBranch(self.branch,
314
314
                    self.master_branch, master_bound_location)
315
315
 
316
316
        # TODO: jam 20051230 We could automatically push local