~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

  • Committer: Aaron Bentley
  • Date: 2009-06-26 03:44:30 UTC
  • mfrom: (4481 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4482.
  • Revision ID: aaron@aaronbentley.com-20090626034430-5btbqa44ikywccsu
Merge bzr.dev into vpipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
475
475
        # subsequent log is accurate
476
476
        self.assertNotContainsRe(out, 'rev1')
477
477
 
 
478
    def test_push_from_subdir(self):
 
479
        t = self.make_branch_and_tree('tree')
 
480
        self.build_tree(['tree/dir/', 'tree/dir/file'])
 
481
        t.add('dir', 'dir/file')
 
482
        t.commit('r1')
 
483
        out, err = self.run_bzr('push ../../pushloc', working_dir='tree/dir')
 
484
        self.assertEqual('', out)
 
485
        self.assertEqual('Created new branch.\n', err)
 
486
 
478
487
 
479
488
class RedirectingMemoryTransport(memory.MemoryTransport):
480
489