/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: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
16
16
 
17
17
import os
18
18
 
19
 
from breezy import shelf
20
 
from breezy.tests import TestCaseWithTransport
21
 
from breezy.tests.script import ScriptRunner
 
19
from bzrlib import shelf
 
20
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests.script import ScriptRunner
22
22
 
23
23
 
24
24
class TestShelveList(TestCaseWithTransport):
84
84
 
85
85
        sr = ScriptRunner()
86
86
        sr.run_script(self, '''
87
 
$ brz add file
 
87
$ bzr add file
88
88
adding file
89
 
$ brz shelve --all -m Foo
 
89
$ bzr shelve --all -m Foo
90
90
2>Selected changes:
91
91
2>-D  file
92
92
2>Changes shelved with id "1".
93
 
$ brz shelve --list
 
93
$ bzr shelve --list
94
94
  1: Foo
95
 
$ brz unshelve --keep
 
95
$ bzr unshelve --keep
96
96
2>Using changes with id "1".
97
97
2>Message: Foo
98
98
2>+N  file
99
99
2>All changes applied successfully.
100
 
$ brz shelve --list
 
100
$ bzr shelve --list
101
101
  1: Foo
102
102
$ cat file
103
103
contents of file
145
145
    def test_directory(self):
146
146
        """Test --directory option"""
147
147
        tree = self.make_branch_and_tree('tree')
148
 
        self.build_tree_contents([('tree/a', b'initial\n')])
 
148
        self.build_tree_contents([('tree/a', 'initial\n')])
149
149
        tree.add('a')
150
150
        tree.commit(message='committed')
151
 
        self.build_tree_contents([('tree/a', b'initial\nmore\n')])
 
151
        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
152
152
        self.run_bzr('shelve -d tree --all')
153
153
        self.assertFileEqual('initial\n', 'tree/a')
154
154
        self.run_bzr('unshelve --directory tree')