/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Robert Collins
  • Date: 2009-08-25 23:47:08 UTC
  • mfrom: (4650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4651.
  • Revision ID: robertc@robertcollins.net-20090825234708-utgl9u6v12sosp5c
NEWS Conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
37
37
    def __init__(self, work_tree, target_tree, file_list=None):
38
38
        """Constructor.
39
39
 
40
 
        :param work_tree: The working tree to apply changes to
 
40
        :param work_tree: The working tree to apply changes to. This is not
 
41
            required to be locked - a tree_write lock will be taken out.
41
42
        :param target_tree: The tree to make the working tree more similar to.
 
43
            This is not required to be locked - a read_lock will be taken out.
42
44
        :param file_list: The files to make more similar to the target.
43
45
        """
44
46
        self.work_tree = work_tree