← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
68
68
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
69
69
 
70
70
    def test_unshelve_keep(self):
71
 
        # https://bugs.edge.launchpad.net/bzr/+bug/492091
 
71
        # https://bugs.launchpad.net/bzr/+bug/492091
72
72
        tree = self.make_branch_and_tree('.')
73
73
        # shelve apparently unhappy working with a tree with no root yet
74
74
        tree.commit('make root')
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')