← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
186
186
        self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))
187
187
 
188
188
    def set_other(self, other_revision):
189
 
        other_branch, self.other_tree = _get_tree(other_revision, 
 
189
        """Set the revision and tree to merge from.
 
190
 
 
191
        This sets the other_tree, other_rev_id, other_basis attributes.
 
192
 
 
193
        :param other_revision: The [path, revision] list to merge from.
 
194
        """
 
195
        other_branch, self.other_tree = _get_tree(other_revision,
190
196
                                                  self.this_branch)
191
197
        if other_revision[1] == -1:
192
198
            self.other_rev_id = other_branch.last_revision()
208
214
        self.set_base([None, None])
209
215
 
210
216
    def set_base(self, base_revision):
 
217
        """Set the base revision to use for the merge.
 
218
 
 
219
        :param base_revision: A 2-list containing a path and revision number.
 
220
        """
211
221
        mutter("doing merge() with no base_revision specified")
212
222
        if base_revision == [None, None]:
213
223
            try:
913
923
        assert not interesting_ids, ('Only supply interesting_ids'
914
924
                                     ' or interesting_files')
915
925
        merger._set_interesting_files(interesting_files)
916
 
    merger.show_base = show_base 
 
926
    merger.show_base = show_base
917
927
    merger.reprocess = reprocess
918
928
    merger.other_rev_id = other_rev_id
919
929
    merger.other_basis = other_rev_id