← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
37
37
import sys
38
38
 
39
39
from bzrlib.branch import Branch
40
 
from bzrlib.clone import copy_branch
41
40
from bzrlib.errors import BzrCommandError
42
41
from bzrlib.osutils import has_symlinks
43
42
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
356
355
        branch = Branch.initialize('branch1')
357
356
        branch.working_tree().add(['file'])
358
357
        branch.working_tree().commit('add file')
359
 
        copy_branch(branch, 'branch2')
 
358
        branch.clone('branch2')
360
359
        print >> open('branch2/file', 'wb'), 'new content'
361
360
        branch2 = Branch.open('branch2')
362
361
        branch2.working_tree().commit('update file')
1352
1351
        url = self.get_remote_url('branch/file')
1353
1352
        output = self.capture('log %s' % url)
1354
1353
        self.assertEqual(8, len(output.split('\n')))
1355
 
        copy = copy_branch(branch, 'branch2')
1356
1354
        # FIXME: rbc 20051128 what is the remainder of this test testing?
1357
1355
        # - it does not seem to be http specific.
 
1356
        copy = branch.clone('branch2')
1358
1357
        branch.working_tree().commit(message='empty commit')
1359
1358
        os.chdir('branch2')
1360
1359
        self.run_bzr('merge', '../branch')