/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/per_repository/test_commit_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-06 02:54:14 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4255.
  • Revision ID: jelmer@samba.org-20090406025414-65tpjwcmjp5wa5oj
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
185
185
            except:
186
186
                builder.abort()
187
187
                raise
188
 
            builder.finish_inventory()
189
188
            self.assertEqual(revision_id, builder.commit('foo bar'))
190
189
        finally:
191
190
            tree.unlock()
830
829
            self.assertEqual(expected_delta, delta)
831
830
            builder.finish_inventory()
832
831
            rev2 = builder.commit('')
833
 
            tree.set_parent_ids([rev2])
834
832
        except:
835
833
            builder.abort()
836
834
            tree.unlock()
837
835
            raise
838
 
        else:
 
836
        try:
 
837
            tree.set_parent_ids([rev2])
 
838
        finally:
839
839
            tree.unlock()
840
840
        return rev2
841
841