/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

fix head tracking when from clause implied

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.mark is None:
 
528
    if cmd.parents:
 
529
        parents = cmd.parents
 
530
    else:
529
531
        last_id = cache_mgr.last_ids.get(cmd.ref)
530
532
        if last_id is not None:
531
533
            parents = [last_id]
532
534
        else:
533
535
            parents = []
534
 
    else:
535
 
        parents = cmd.parents
536
536
    # Track the heads
537
537
    for parent in parents:
538
538
        try: