← Back to branch summary

~bzr/ubuntu/lucid/bzr/sru

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Jelmer Vernooij
  • Date: 2010-02-17 16:50:04 UTC
  • mfrom: (3815.1617.11 2.1.0-dev)
  • Revision ID: jelmer@samba.org-20100217165004-hxdu61ebd38dwa4t
Tags: 2.1.0-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
114
114
                tt.cancel_versioning(trans_id)
115
115
                tt.set_executability(None, trans_id)
116
116
 
117
 
    def add_dir(self, file_id, parent, name):
118
 
        for tt in self.list_transforms():
119
 
            parent_id = tt.trans_id_file_id(parent)
120
 
            tt.new_directory(name, parent_id, file_id)
 
117
    def add_dir(self, file_id, parent, name, this=True, base=True, other=True):
 
118
        for option, tt in self.selected_transforms(this, base, other):
 
119
            if option is True:
 
120
                parent_id = tt.trans_id_file_id(parent)
 
121
                tt.new_directory(name, parent_id, file_id)
121
122
 
122
123
    def change_name(self, id, base=None, this=None, other=None):
123
124
        for val, tt in ((base, self.base_tt), (this, self.this_tt),