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

  • Committer: Martin Pool
  • Date: 2009-03-13 01:27:47 UTC
  • mfrom: (4138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4140.
  • Revision ID: mbp@sourcefrog.net-20090313012747-igvrav6sr7irhz1l
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
74
74
        # a-rev-tree is special because it appears in both the revision
75
75
        # tree and the working tree
76
76
        self.build_tree_contents([('a-rev-tree', 'foo\n'),
77
 
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n')])
 
77
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n'), ('e-rev', 'qux\n')])
78
78
        tree.lock_write()
79
79
        try:
80
 
            tree.add(['a-rev-tree', 'c-rev', 'd-rev'])
81
 
            tree.commit('add test files')
 
80
            tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
 
81
            tree.commit('add test files', rev_id='first')
82
82
            # remove currently uses self._write_inventory -
83
83
            # work around that for now.
84
84
            tree.flush()
85
85
            tree.remove(['d-rev'])
86
86
            tree.rename_one('a-rev-tree', 'b-tree')
87
87
            tree.rename_one('c-rev', 'a-rev-tree')
 
88
            tree.rename_one('e-rev', 'old-rev')
 
89
            self.build_tree_contents([('e-rev', 'new\n')])
 
90
            tree.add(['e-rev'])
88
91
        finally:
89
92
            # calling bzr as another process require free lock on win32
90
93
            tree.unlock()
108
111
        self.assertEqual('baz\n', out)
109
112
        self.assertEqual('', err)
110
113
 
 
114
        # the actual file-id for e-rev doesn't exist in the old tree
 
115
        out, err = self.run_bzr_subprocess('cat e-rev -rrevid:first')
 
116
        self.assertEqual('qux\n', out)
 
117
        self.assertEqual('', err)
 
118
 
111
119
    def test_remote_cat(self):
112
120
        wt = self.make_branch_and_tree('.')
113
121
        self.build_tree(['README'])