← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-12-03 02:24:54 UTC
  • mfrom: (4634.101.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4857.
  • Revision ID: andrew.bennetts@canonical.com-20091203022454-m2gyhbcdqi1t7ujz
Merge lp:bzr/2.0 into lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
335
335
        # The push should have created target/a
336
336
        self.failUnlessExists('target/a')
337
337
 
 
338
    def test_push_use_existing_into_empty_bzrdir(self):
 
339
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
 
340
        fails.
 
341
        """
 
342
        tree = self.create_simple_tree()
 
343
        self.build_tree(['target/', 'target/.bzr/'])
 
344
        self.run_bzr_error(
 
345
            ['Target directory ../target already contains a .bzr directory, '
 
346
             'but it is not valid.'],
 
347
            'push ../target --use-existing-dir', working_dir='tree')
 
348
 
338
349
    def test_push_onto_repo(self):
339
350
        """We should be able to 'bzr push' into an existing bzrdir."""
340
351
        tree = self.create_simple_tree()