← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-09-18 21:37:03 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050918213703-20437815d381a735
Set a pending_merge if the merge base is forced to revno 0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
285
285
                base_rev_id = None
286
286
            else:
287
287
                base_rev_id = base_branch.lookup_revision(base_revision[1])
288
 
            if base_rev_id is not None:
289
 
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
290
 
                                               MultipleRevisionSources(this_branch, 
291
 
                                                                       base_branch))
292
 
            else:
293
 
                base_is_ancestor = False
 
288
            multi_source = MultipleRevisionSources(this_branch, base_branch)
 
289
            base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
 
290
                                           multi_source)
294
291
        if file_list is None:
295
292
            interesting_ids = None
296
293
        else: