← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Robert Collins
  • Date: 2005-09-29 02:55:34 UTC
  • mfrom: (1185.1.47)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050929025534-1782933743abbfd5
update with integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
28
28
 
29
29
from cStringIO import StringIO
30
30
import os
 
31
import shutil
31
32
import sys
32
33
import os
33
34
 
230
231
        os.chdir('..')
231
232
        self.runbzr('branch a b')
232
233
        self.runbzr('branch a c -r 1')
 
234
        os.chdir('b')
 
235
        self.runbzr('commit -m foo --unchanged')
 
236
        os.chdir('..')
 
237
        shutil.rmtree('a/.bzr/revision-store')
 
238
        shutil.rmtree('a/.bzr/inventory-store')
 
239
        shutil.rmtree('a/.bzr/text-store')
 
240
        self.runbzr('branch a d --basis b')
233
241
 
234
242
    def test_merge(self):
235
243
        from bzrlib.branch import Branch
295
303
        os.chdir('../b/subdir')
296
304
        self.runbzr('pull ../../a')
297
305
        assert a.revision_history()[-1] == b.revision_history()[-1]
 
306
        self.runbzr('commit -m blah5 --unchanged')
 
307
        self.runbzr('commit -m blah6 --unchanged')
 
308
        os.chdir('..')
 
309
        self.runbzr('pull ../a')
 
310
        os.chdir('../a')
 
311
        self.runbzr('commit -m blah7 --unchanged')
 
312
        self.runbzr('merge ../b')
 
313
        self.runbzr('commit -m blah8 --unchanged')
 
314
        self.runbzr('pull ../b')
 
315
        self.runbzr('pull ../b')
298
316
        
299
317
    def test_add_reports(self):
300
318
        """add command prints the names of added files."""