← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2006-05-11 08:17:09 UTC
  • mto: This revision was merged to the branch mainline in revision 1707.
  • Revision ID: mbp@sourcefrog.net-20060511081709-2cf6b60a3d5a33fb
use the correct transaction when committing snapshot (Malone: #43959)

Without this, file merges committed in a checkout can't be properly 
pushed into the master repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
512
512
            if ie.revision is None:
513
513
                change = ie.snapshot(self.rev_id, path, previous_entries,
514
514
                                     self.work_tree, self.weave_store,
515
 
                                     self.branch.get_transaction())
 
515
                                     self.branch.repository.get_transaction())
516
516
            else:
517
517
                change = "unchanged"
518
518
            self.reporter.snapshot_change(change, path)