/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/workingtree_implementations/test_commit.py

(broken) merge aaron's workingtree format changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_commit.py
198
198
        self.assertFalse(wt.has_filename('b/c'))
199
199
        self.assertFalse(wt.has_filename('d'))
200
200
        wt.unlock()
 
201
 
 
202
    def test_commit_move_new(self):
 
203
        wt = self.make_branch_and_tree('first')
 
204
        wt.commit('first')
 
205
        wt2 = wt.bzrdir.sprout('second').open_workingtree()
 
206
        self.build_tree(['second/name1'])
 
207
        wt2.add('name1', 'name1-id')
 
208
        wt2.commit('second')
 
209
        wt.merge_from_branch(wt2.branch)
 
210
        wt.rename_one('name1', 'name2')
 
211
        wt.commit('third')
 
212
        wt.path2id('name1-id')
201
213
        
202
214
 
203
215
class TestCommitProgress(TestCaseWithWorkingTree):