/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

[patch] 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
511
511
            if ie.revision is None:
512
512
                change = ie.snapshot(self.rev_id, path, previous_entries,
513
513
                                     self.work_tree, self.weave_store,
514
 
                                     self.branch.get_transaction())
 
514
                                     self.branch.repository.get_transaction())
515
515
            else:
516
516
                change = "unchanged"
517
517
            self.reporter.snapshot_change(change, path)