~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_rename_map.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-08 13:13:30 UTC
  • mfrom: (4202.4.3 348459-wrong-annotation)
  • mto: This revision was merged to the branch mainline in revision 4273.
  • Revision ID: v.ladeuil+lp@free.fr-20090408131330-mx1hq45oarrxia2z
Allows external annotation tie-breakers

Show diffs side-by-side

added added

removed removed

Lines of Context:
150
150
        """When a directory has been moved, its children are preserved."""
151
151
        tree = self.make_branch_and_tree('tree')
152
152
        tree.lock_write()
153
 
        self.addCleanup(tree.unlock)
154
153
        self.build_tree_contents([('tree/foo/', ''),
155
154
                                  ('tree/foo/bar', 'bar'),
156
155
                                  ('tree/foo/empty', '')])