← 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

 * The internal storage of history, and logical branch identity have now
   been split into Branch, and Repository. The common locking and file 
   management routines are now in bzrlib.lockablefiles. 
   (Aaron Bentley, Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
171
171
        mutter('start selective subdir commit')
172
172
        run_bzr('commit', 'a', '-m', 'commit a only')
173
173
        
174
 
        old = b.revision_tree(b.get_rev_id(1))
175
 
        new = b.revision_tree(b.get_rev_id(2))
 
174
        old = b.repository.revision_tree(b.get_rev_id(1))
 
175
        new = b.repository.revision_tree(b.get_rev_id(2))
176
176
        
177
177
        eq(new.get_file_by_path('b/two').read(), 'old contents')
178
178
        eq(new.get_file_by_path('top').read(), 'old contents')
181
181
        os.chdir('a')
182
182
        # commit from here should do nothing
183
183
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
184
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
184
        v3 = b.repository.revision_tree(b.get_rev_id(3))
185
185
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
186
186
        eq(v3.get_file_by_path('top').read(), 'old contents')
187
187
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
188
188
                
189
189
        # commit in subdirectory commits whole tree
190
190
        run_bzr('commit', '-m', 'commit whole tree from subdir')
191
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
191
        v4 = b.repository.revision_tree(b.get_rev_id(4))
192
192
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
193
193
        eq(v4.get_file_by_path('top').read(), 'new contents')
194
194