~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2005-09-23 03:05:48 UTC
mto: (1092.3.4) (1185.41.1 bzr.sftp) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050923030548-8a8f35795af92b66

nuke duplicate test functions

added added

removed removed

211

output = self.runbzr('diff -r last:3..last:1', backtick=1)

212

self.assert_('\n+baz' in output)

213

214

def test_diff(self):

215

self.example_branch()

216

file('hello', 'wt').write('hello world!')

217

self.runbzr('commit -m fixing hello')

218

output = self.runbzr('diff -r 2..3', backtick=1)

219

self.assert_('\n+hello world!' in output)

220

output = self.runbzr('diff -r last:3..last:1', backtick=1)

221

self.assert_('\n+baz' in output)

222

223

214

def test_merge(self):

224

215

from bzrlib.branch import Branch

225

216