/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_added.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:
bzrlib/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
67
67
        # after commit, now no longer listed
68
68
        tree.commit(message='add "%s"' % (name))
69
69
        check_added('')
 
70
 
 
71
    def test_added_directory(self):
 
72
        """Test --directory option"""
 
73
        tree = self.make_branch_and_tree('a')
 
74
        self.build_tree(['a/README'])
 
75
        tree.add('README')
 
76
        out, err = self.run_bzr(['added', '--directory=a'])
 
77
        self.assertEquals('README\n', out)