/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_transform.py

  • Committer: Aaron Bentley
  • Date: 2007-12-02 02:29:02 UTC
  • mfrom: (3009.1.1 bzr.bug162264)
  • mto: This revision was merged to the branch mainline in revision 3064.
  • Revision ID: aaron.bentley@utoronto.ca-20071202022902-zbcg5bf5t6aivn5v
Update for Linux

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1097
1097
            try:
1098
1098
                tt.new_file('foo', tt.root, 'bar')
1099
1099
                tt.new_file('Foo', tt.root, 'spam')
 
1100
                # Lie to tt that we've already resolved all conflicts.
1100
1101
                tt.apply(no_conflicts=True)
1101
 
            finally:
 
1102
            except:
1102
1103
                wt.unlock()
 
1104
                raise
1103
1105
        err = self.assertRaises(errors.FileExists, tt_helper)
1104
1106
        self.assertContainsRe(str(err),
1105
1107
            "^File exists: .+/foo")
1109
1111
            wt = self.make_branch_and_tree('.')
1110
1112
            tt = TreeTransform(wt)  # TreeTransform obtains write lock
1111
1113
            try:
1112
 
                tt.new_directory('foo', tt.root)
1113
 
                tt.new_directory('foo', tt.root)
 
1114
                foo_1 = tt.new_directory('foo', tt.root)
 
1115
                tt.new_directory('bar', foo_1)
 
1116
                foo_2 = tt.new_directory('foo', tt.root)
 
1117
                tt.new_directory('baz', foo_2)
 
1118
                # Lie to tt that we've already resolved all conflicts.
1114
1119
                tt.apply(no_conflicts=True)
1115
 
            finally:
 
1120
            except:
1116
1121
                wt.unlock()
 
1122
                raise
1117
1123
        err = self.assertRaises(errors.FileExists, tt_helper)
1118
1124
        self.assertContainsRe(str(err),
1119
1125
            "^File exists: .+/foo")
1553
1559
        mover.rename('c/e', 'c/d')
1554
1560
        try:
1555
1561
            mover.rename('a', 'c')
1556
 
        except OSError, e:
 
1562
        except errors.FileExists, e:
1557
1563
            mover.rollback()
1558
1564
        self.failUnlessExists('a')
1559
1565
        self.failUnlessExists('c/d')