/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 processors/generic_processor.py

support merges when from clause implicit

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
525
525
    :return: the list of parents in terms of commit-ids
526
526
    """
527
527
    # Get the true set of parents
528
 
    if cmd.parents:
529
 
        parents = cmd.parents
 
528
    if cmd.from_ is not None:
 
529
        parents = [cmd.from_]
530
530
    else:
531
531
        last_id = cache_mgr.last_ids.get(cmd.ref)
532
532
        if last_id is not None:
533
533
            parents = [last_id]
534
534
        else:
535
535
            parents = []
 
536
    parents.extend(cmd.merges)
536
537
    # Track the heads
537
538
    for parent in parents:
538
539
        try: