← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
150
150
        mutter('start selective subdir commit')
151
151
        run_bzr('commit', 'a', '-m', 'commit a only')
152
152
        
153
 
        old = b.revision_tree(b.get_rev_id(1))
154
 
        new = b.revision_tree(b.get_rev_id(2))
 
153
        old = b.repository.revision_tree(b.get_rev_id(1))
 
154
        new = b.repository.revision_tree(b.get_rev_id(2))
155
155
        
156
156
        eq(new.get_file_by_path('b/two').read(), 'old contents')
157
157
        eq(new.get_file_by_path('top').read(), 'old contents')
160
160
        os.chdir('a')
161
161
        # commit from here should do nothing
162
162
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
163
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
163
        v3 = b.repository.revision_tree(b.get_rev_id(3))
164
164
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
165
165
        eq(v3.get_file_by_path('top').read(), 'old contents')
166
166
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
167
167
                
168
168
        # commit in subdirectory commits whole tree
169
169
        run_bzr('commit', '-m', 'commit whole tree from subdir')
170
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
170
        v4 = b.repository.revision_tree(b.get_rev_id(4))
171
171
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
172
172
        eq(v4.get_file_by_path('top').read(), 'new contents')
173
173