~bzr-pqm/bzr/bzr.dev

Committer: mbp at sourcefrog
Date: 2005-10-20 02:17:07 UTC
mfrom: (1471)
mto: (1185.41.1 bzr.sftp) (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)
mto: This revision was merged to the branch mainline in revision 1484.
Revision ID: mbp@sourcefrog.net-20051020021707-8a59b483bb86fe9c

[merge] robert

added added

removed removed

400

self.runbzr('commit -m blah2 --unchanged')

401

os.chdir('../b')

402

self.runbzr('commit -m blah3 --unchanged')

403

# no clobber

403

404

self.runbzr('pull ../a', retcode=1)

405

os.chdir('..')

406

self.runbzr('branch b clobberme')

407

os.chdir('clobberme')

408

self.runbzr('pull --clobber ../a')

409

clobbered = Branch.open('.')

410

self.assertEqual(clobbered.revision_history(),

411

a.revision_history())

404

412

os.chdir('../a')

405

413

self.runbzr('merge ../b')

406

414

self.runbzr('commit -m blah4 --unchanged')