/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Alexey Shamrin
  • Date: 2005-11-21 09:07:18 UTC
  • mfrom: (1185.38.10)
  • mto: (1185.33.35 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 1510.
  • Revision ID: shamrin@gmail.com-20051121090718-48400620bf12c6c6
merge forgotten win32 fixes from http://bzr.arbash-meinel.com/branches/bzr/win32/

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
352
352
        self.runbzr('diff')
353
353
 
354
354
    def test_diff_branches(self):
355
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
 
355
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'], line_endings='binary')
356
356
        branch = Branch.initialize('branch1')
357
357
        branch.add(['file'])
358
358
        branch.working_tree().commit('add file')
359
359
        copy_branch(branch, 'branch2')
360
 
        print >> open('branch2/file', 'w'), 'new content'
 
360
        print >> open('branch2/file', 'wb'), 'new content'
361
361
        branch2 = Branch.open('branch2')
362
362
        branch2.working_tree().commit('update file')
363
363
        # should open branch1 and diff against branch2,