~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Martin Pool
  • Date: 2005-08-25 09:17:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050825091719-b2d7be7bf56bb35a
- fix a few errors in new merge code

Show diffs side-by-side

added added

removed removed

Lines of Context:
204
204
 
205
205
 
206
206
def find_present_ancestors(revision_id, revision_source):
207
 
    """Return the ancestors of a revision present in a branch.
208
 
 
209
 
    It's possible that a branch won't have the complete ancestry of
210
 
    one of its revisions.  
211
 
 
212
 
    """
213
207
    found_ancestors = {}
214
208
    count = 0
215
209
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,