← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1916
1916
        branch.lock_write()
1917
1917
        self.addCleanup(branch.unlock)
1918
1918
        tt = TransformPreview(branch.basis_tree())
 
1919
        self.addCleanup(tt.finalize)
1919
1920
        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
1920
1921
        rev = tt.commit(branch, 'my message')
1921
1922
        self.assertEqual([], branch.basis_tree().get_parent_ids())
1927
1928
        branch.lock_write()
1928
1929
        self.addCleanup(branch.unlock)
1929
1930
        tt = TransformPreview(branch.basis_tree())
 
1931
        self.addCleanup(tt.finalize)
1930
1932
        e = self.assertRaises(ValueError, tt.commit, branch,
1931
1933
                          'my message', ['rev1b-id'])
1932
1934
        self.assertEqual('Cannot supply merge parents for first commit.',
1957
1959
        tt.new_file('file', tt.root, 'contents', 'file-id')
1958
1960
        tt.commit(branch, 'message', strict=True)
1959
1961
        tt = TransformPreview(branch.basis_tree())
 
1962
        self.addCleanup(tt.finalize)
1960
1963
        trans_id = tt.trans_id_file_id('file-id')
1961
1964
        tt.delete_contents(trans_id)
1962
1965
        tt.create_file('contents', trans_id)