← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
316
316
                # Add revision data to the local branch
317
317
                self.rev_id = self.builder.commit(self.message)
318
318
            except:
319
 
                # perhaps this should be done by the CommitBuilder ?
320
 
                self.work_tree.branch.repository.abort_write_group()
 
319
                self.builder.abort()
321
320
                raise
322
321
 
323
322
            # Upload revision data to the master.
690
689
        # it fails; a better way of approaching this is to 
691
690
        # finally implement the explicit-caches approach design
692
691
        # a while back - RBC 20070306.
693
 
        if (sub_tree.branch.repository.bzrdir.root_transport.base
694
 
            ==
695
 
            self.work_tree.branch.repository.bzrdir.root_transport.base):
 
692
        if sub_tree.branch.repository.has_same_location(
 
693
            self.work_tree.branch.repository):
696
694
            sub_tree.branch.repository = \
697
695
                self.work_tree.branch.repository
698
696
        try: