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

  • Committer: Rory Yorke
  • Date: 2010-09-24 16:16:13 UTC
  • mto: This revision was merged to the branch mainline in revision 5455.
  • Revision ID: rory.yorke@gmail.com-20100924161613-269xiflsrhqrhydh
Added --show-base to pull and update (bug 202374).

Behaviour copied from merge.  Tests in
tests/blackbox/test_{pull,update}.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
174
174
        return set(self._repository.get_ancestry(self._revision_id,
175
175
                                                 topo_sorted=False))
176
176
 
 
177
    def is_locked(self):
 
178
        return self._repository.is_locked()
 
179
 
177
180
    def lock_read(self):
178
181
        self._repository.lock_read()
 
182
        return self
179
183
 
180
184
    def __repr__(self):
181
185
        return '<%s instance at %x, rev_id=%r>' % (