/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 breezy/tests/test_commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-11 02:08:52 UTC
  • mfrom: (7510.1.3 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200611020852-jdb9d037vj6shvyj
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/385542

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit.py
529
529
        bound = master.sprout('bound')
530
530
        wt = bound.open_workingtree()
531
531
        wt.branch.set_bound_location(os.path.realpath('master'))
532
 
        master_branch.lock_write()
533
 
        try:
 
532
        with master_branch.lock_write():
534
533
            self.assertRaises(LockContention, wt.commit, 'silly')
535
 
        finally:
536
 
            master_branch.unlock()
537
534
 
538
535
    def test_commit_bound_merge(self):
539
536
        # see bug #43959; commit of a merge in a bound branch fails to push