~lifeless/bzr/5158

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Robert Collins
  • Date: 2008-08-05 09:43:41 UTC
  • Revision ID: robertc@robertcollins.net-20080805094341-uelcr4qz98trh2yj
Implement the oft-discussed automatic-add-and-delete at commit time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
192
192
        os.unlink('child/file1')
193
193
        file('child/file2', 'wb').write('hello\n')
194
194
        self.run_bzr(['commit', '-m', 'remove file1 and modify file2',
195
 
            'child'])
 
195
            'child', '-a'])
196
196
        os.chdir('parent')
197
197
        self.run_bzr('merge ../child')
198
198
        wt.commit('merge child branch')
473
473
        os.unlink('child/f1')
474
474
        file('child/f2', 'wb').write('hello\n')
475
475
        self.run_bzr(['commit', '-m', 'removed f1 and modified f2',
476
 
            'child'])
 
476
            'child', '-a'])
477
477
        os.chdir('parent')
478
478
        self.run_bzr('merge ../child')
479
479
        wt.commit('merge branch 1')