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

  • Committer: Martin Pool
  • Date: 2010-08-13 07:56:06 UTC
  • mfrom: (5050.17.4 2.2)
  • mto: (5050.17.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@sourcefrog.net-20100813075606-8zgmov3ezwans2zo
merge bzr 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
97
97
        tree.add('file')
98
98
        os.chdir('tree/dir')
99
99
        self.run_bzr('shelve --all ../file')
 
100
 
 
101
 
 
102
class TestShelveUnshelve(TestCaseWithTransport):
 
103
 
 
104
    def test_directory(self):
 
105
        """Test --directory option"""
 
106
        tree = self.make_branch_and_tree('tree')
 
107
        self.build_tree_contents([('tree/a', 'initial\n')])
 
108
        tree.add('a')
 
109
        tree.commit(message='committed')
 
110
        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
 
111
        self.run_bzr('shelve -d tree --all')
 
112
        self.assertFileEqual('initial\n', 'tree/a')
 
113
        self.run_bzr('unshelve --directory tree')
 
114
        self.assertFileEqual('initial\nmore\n', 'tree/a')