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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-09 20:55:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120109205507-2i3en5r4w4ohdchj
Use idioms coherently and add comments to make their purpose clearer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
424
424
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
425
425
        self.assertEqual(md.target_branch, tree_b.branch.base)
426
426
        tree_b.branch.lock_write()
427
 
        tree_b.branch.set_public_branch('http://example.com')
428
 
        tree_b.branch.unlock()
 
427
        try:
 
428
            tree_b.branch.set_public_branch('http://example.com')
 
429
        finally:
 
430
            tree_b.branch.unlock()
429
431
        md2 = self.from_objects(
430
432
              tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
431
433
              patch_type=None, public_branch=branch_c.base)