← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2006-01-30 06:23:50 UTC
  • mfrom: (1534.1.17 integration)
  • Revision ID: mbp@sourcefrog.net-20060130062350-d6f25277ddcdfd79
[merge] robert's integration of much recent work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
23
23
 
24
24
import bzrlib
25
25
from bzrlib.branch import Branch
26
 
from bzrlib.clone import copy_branch
27
26
from bzrlib.tests.blackbox import ExternalBase
28
27
 
29
28
 
56
55
        branch = Branch.initialize('branch1')
57
56
        branch.working_tree().add(['file'])
58
57
        branch.working_tree().commit('add file')
59
 
        copy_branch(branch, 'branch2')
 
58
        branch.clone('branch2')
60
59
        print >> open('branch2/file', 'wb'), 'new content'
61
60
        branch2 = Branch.open('branch2')
62
61
        branch2.working_tree().commit('update file')
94
93
        print >> open('branch1/file1', 'wb'), 'new line'
95
94
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
96
95
        self.assertTrue('\n-original line\n+new line\n' in output[0])
97