← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-08-21 01:32:29 UTC
  • mfrom: (2727 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2736.
  • Revision ID: aaron.bentley@utoronto.ca-20070821013229-miopsemz249tv0bl
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
316
316
        out, err = self.run_bzr('pull ../bundle')
317
317
        self.assertEqual(err, '')
318
318
        self.assertEqual(out, 'No revisions to pull.\n')
 
319
 
 
320
    def test_pull_verbose_no_files(self):
 
321
        """Pull --verbose should not list modified files"""
 
322
        tree_a = self.make_branch_and_tree('tree_a')
 
323
        self.build_tree(['tree_a/foo'])
 
324
        tree_a.add('foo')
 
325
        tree_a.commit('bar')
 
326
        tree_b = self.make_branch_and_tree('tree_b')
 
327
        out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
 
328
        self.assertContainsRe(out, 'bar')
 
329
        self.assertNotContainsRe(out, 'added:')
 
330
        self.assertNotContainsRe(out, 'foo')