/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/tests/blackbox/test_bound_branches.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
349
349
 
350
350
        bzr('cat-revision', new_rev_id)
351
351
 
352
 
    def test_pull_overwrite_fails(self):
 
352
    def test_pull_overwrite(self):
 
353
        # XXX: This test should be moved to branch-implemenations/test_pull
353
354
        bzr = self.run_bzr
354
355
        self.create_branches()
355
356
 
373
374
        self.check_revno(2)
374
375
        self.check_revno(2, '../base')
375
376
 
376
 
        # It might be possible that we want pull --overwrite to
377
 
        # actually succeed.
378
 
        # If we want it, just change this test to make sure that 
379
 
        # both base and child are updated properly
380
 
        bzr('pull', '--overwrite', '../other', retcode=3)
381
 
 
382
 
        # It should fail without changing the local revision
383
 
        self.check_revno(2)
384
 
        self.check_revno(2, '../base')
385
 
 
386
 
    # TODO: jam 20051230 Test that commit & pull fail when the branch we 
387
 
    #       are bound to is not available
388
 
 
389
 
 
 
377
        bzr('pull', '--overwrite', '../other')
 
378
 
 
379
        # both the local and master should have been updated.
 
380
        self.check_revno(4)
 
381
        self.check_revno(4, '../base')