/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_cat_revision.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2004, 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2004-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
64
64
        err = self.run_bzr('cat-revision abcd', retcode=3)[1]
65
65
        self.assertContainsRe(err, 'The repository .* contains no revision abcd.')
66
66
 
67
 
 
 
67
    def test_cat_revision_directory(self):
 
68
        """Test --directory option"""
 
69
        tree = self.make_branch_and_tree('a')
 
70
        tree.commit('This revision', rev_id='abcd')
 
71
        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
 
72
        self.assertContainsRe(output, 'This revision')
 
73
        self.assertEqual('', errors)