← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-10 22:20:12 UTC
  • mfrom: (5582 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110110222012-mtcqudkvmzwiufuc
Merge in the bzr.dev 5582

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
29
29
    controldir,
30
30
    errors,
31
31
    help_topics,
 
32
    lock,
32
33
    repository,
33
34
    osutils,
34
35
    remote,
1349
1350
    def set_parent(self, parent):
1350
1351
        self._parent = parent
1351
1352
 
 
1353
    def lock_read(self):
 
1354
        return lock.LogicalLockResult(self.unlock)
 
1355
 
 
1356
    def unlock(self):
 
1357
        return
 
1358
 
1352
1359
 
1353
1360
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1354
1361