← 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-28 09:35:50 UTC
  • mfrom: (1185.1.47)
  • Revision ID: robertc@robertcollins.net-20050928093550-3ca194dfaffc79f1
merge from 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
 
33
34
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
223
224
        os.chdir('..')
224
225
        self.runbzr('branch a b')
225
226
        self.runbzr('branch a c -r 1')
 
227
        os.chdir('b')
 
228
        self.runbzr('commit -m foo --unchanged')
 
229
        os.chdir('..')
 
230
        shutil.rmtree('a/.bzr/revision-store')
 
231
        # naughty - abstraction violations RBC 20050928  
 
232
        shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
 
233
        shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
 
234
        self.runbzr('branch a d --basis b')
226
235
 
227
236
    def test_merge(self):
228
237
        from bzrlib.branch import Branch
283
292
        self.runbzr('commit -m blah3 --unchanged')
284
293
        self.runbzr('pull ../a', retcode=1)
285
294
        print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
286
 
##        os.chdir('../a')
287
 
##        self.runbzr('merge ../b')
288
 
##        self.runbzr('commit -m blah4 --unchanged')
289
 
##        os.chdir('../b/subdir')
290
 
##        self.runbzr('pull ../../a')
291
 
##        assert a.revision_history()[-1] == b.revision_history()[-1]
 
295
        return
 
296
        os.chdir('../a')
 
297
        self.runbzr('merge ../b')
 
298
        self.runbzr('commit -m blah4 --unchanged')
 
299
        os.chdir('../b/subdir')
 
300
        self.runbzr('pull ../../a')
 
301
        assert a.revision_history()[-1] == b.revision_history()[-1]
 
302
        self.runbzr('commit -m blah5 --unchanged')
 
303
        self.runbzr('commit -m blah6 --unchanged')
 
304
        os.chdir('..')
 
305
        self.runbzr('pull ../a')
 
306
        os.chdir('../a')
 
307
        self.runbzr('commit -m blah7 --unchanged')
 
308
        self.runbzr('merge ../b')
 
309
        self.runbzr('commit -m blah8 --unchanged')
 
310
        self.runbzr('pull ../b')
 
311
        self.runbzr('pull ../b')
292
312
        
293
313
    def test_add_reports(self):
294
314
        """add command prints the names of added files."""