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

  • Committer: Robert Collins
  • Date: 2009-08-26 03:20:32 UTC
  • mfrom: (4637 +trunk)
  • mto: (4634.6.2 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: robertc@robertcollins.net-20090826032032-mx5kiog3eihaoy13
Merge and cherrypick outstanding 2.0 relevant patches from bzr.dev: Up to rev
4637, then 4639,4641,4643,4646,4649,4650,4651. (Robert Collins)

Log messages of the incorporated fixes:

revno: 4651 [merge]
  (robertc) Enable commit via record_iter_changes for specific file
        comments. (Robert Collins)

revno: 4650 [merge]
  Fix shelve on windows. (Robert Collins, #305006)

revno: 4649 [merge]
  (robertc) Make iter_changes produce output that is always safe to
        generate inventory deltas of in the same direction as the
        changes. (Robert Collins, #347649)

revno: 4646 [merge]
  (mbp) developer documentation about content filtering

revno: 4643 [merge]
  (mbp) small tweaks to release documentation

revno: 4641 [merge]
  (abentley) Shelve will not remove tree root.

revno: 4639 [merge]
  (andrew) Fix 'Revision ... not present' errors when upgrading stacked
        branches.

revno: 4637 [merge]
  Fix upgrade of branches in repositories.

revno: 4636 [merge]
  (mbp) fix crash formatting CannotBindAddress

revno: 4635 [merge]
  (robertc) Fix many locking errors on windows due to a small bug in
        merge.transform_tree. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
201
201
        tt.apply()
202
202
        return self._convert_tree(tree, converter)
203
203
 
 
204
    def get_tree_no_parents_abc_content_7(self, tree, converter=None):
 
205
        """return a test tree with a, b/, d/e contents.
 
206
 
 
207
        This variation adds a dir 'd' ('d-id'), renames b to d/e.
 
208
        """
 
209
        self._make_abc_tree(tree)
 
210
        self.build_tree(['d/'], transport=tree.bzrdir.root_transport)
 
211
        tree.add(['d'], ['d-id'])
 
212
        tt = transform.TreeTransform(tree)
 
213
        trans_id = tt.trans_id_tree_path('b')
 
214
        parent_trans_id = tt.trans_id_tree_path('d')
 
215
        tt.adjust_path('e', parent_trans_id, trans_id)
 
216
        tt.apply()
 
217
        return self._convert_tree(tree, converter)
 
218
 
204
219
    def get_tree_with_subdirs_and_all_content_types(self):
205
220
        """Return a test tree with subdirs and all content types.
206
221
        See get_tree_with_subdirs_and_all_supported_content_types for details.