← 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

(andrew) Fix ObjectNotLocked error when doing 'bzr annotate -r
        branch:...' (#496590)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
319
319
        # The push should have created target/a
320
320
        self.failUnlessExists('target/a')
321
321
 
 
322
    def test_push_use_existing_into_empty_bzrdir(self):
 
323
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
 
324
        fails.
 
325
        """
 
326
        tree = self.create_simple_tree()
 
327
        self.build_tree(['target/', 'target/.bzr/'])
 
328
        self.run_bzr_error(
 
329
            ['Target directory ../target already contains a .bzr directory, '
 
330
             'but it is not valid.'],
 
331
            'push ../target --use-existing-dir', working_dir='tree')
 
332
 
322
333
    def test_push_onto_repo(self):
323
334
        """We should be able to 'bzr push' into an existing bzrdir."""
324
335
        tree = self.create_simple_tree()