← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_unversion.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_unversion.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
42
42
        # unversioning children of reparented children of unversioned
43
43
        # paths when relocation entries are present and the relocation
44
44
        # points later into the dirstate.
45
 
        tree = self.make_branch_and_tree(['.'])
 
45
        tree = self.make_branch_and_tree('.')
46
46
        self.build_tree(['del/', 'del/sub/', 'del/sub/b'])
47
47
        tree.add(['del', 'del/sub', 'del/sub/b'], ['del', 'sub', 'b'])
48
48
        tree.commit('setup')