def modify_working_tree(self, tree):
if 0: tree = WorkingTree()
tree.merge_from_branch(self.branch_tree.branch, 'rev-b')
self.build_tree_contents([
('trunk/added', ''),
('trunk/addedmissing', ''),
('trunk/modified', 'new'),
('trunk/unversioned', ''),
])
tree.add(['added'], ['added-id'])
tree.add(['addedmissing'], ['addedmissing-id'])
tree.rename_one('renamed', 'renamed1')
tree.move(('moved', ), 'dir')
tree.rename_one('movedandrenamed', 'movedandrenamed1')
tree.move(('movedandrenamed1', ), 'dir')
tree.remove(('removed', ))
os.remove('trunk/missing')
os.remove('trunk/addedmissing')
# test for https://bugs.launchpad.net/qbzr/+bug/538753
# must sort before trunk/dir
self.build_tree(['trunk/a-newdir/'])
self.build_tree_contents([('trunk/a-newdir/newdirchild', '')])
tree.add(['a-newdir'], ['a-newdir-id'])
tree.add(['a-newdir/newdirchild'], ['newdirchild-id'])
# manuly add conflicts for files that don't exist
# See https://bugs.launchpad.net/qbzr/+bug/528548
tree.add_conflicts([TextConflict('nofileconflict')])
