← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-25 05:01:17 UTC
  • mto: (1185.14.1) (1393.1.21)
  • mto: This revision was merged to the branch mainline in revision 1391.
  • Revision ID: aaron.bentley@utoronto.ca-20050925050117-dc4b46505adfc0d7
Added --basis option to bzr branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
29
29
from cStringIO import StringIO
30
30
import sys
31
31
import os
 
32
import shutil
32
33
 
33
34
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
34
35
from bzrlib.branch import Branch
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
        shutil.rmtree('a/.bzr/inventory-store')
 
232
        shutil.rmtree('a/.bzr/text-store')
 
233
        self.runbzr('branch a d --basis b')
226
234
 
227
235
    def test_merge(self):
228
236
        from bzrlib.branch import Branch