~bzr-pqm/bzr/bzr.dev

Committer: Martin Pool
Date: 2005-11-22 04:13:44 UTC
mfrom: (1185.39.2 win32.forgotten)
mto: (1508.1.15) (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1510.
Revision ID: mbp@sourcefrog.net-20051122041344-d98af0e4bc18f3da

[merge] win32 fixes (alexey)

added added

removed removed

352

self.runbzr('diff')

353

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

branch = Branch.initialize('branch1')

357

branch.add(['file'])

358

branch.working_tree().commit('add file')

359

copy_branch(branch, 'branch2')

360

print >> open('branch2/file', 'w'), 'new content'

360

print >> open('branch2/file', 'wb'), 'new content'

361

branch2 = Branch.open('branch2')

362

branch2.working_tree().commit('update file')

363

# should open branch1 and diff against branch2,