Changeset 18


Ignore:
Timestamp:
Jun 10, 2009 3:24:20 PM (15 years ago)
Author:
retracile
Message:

Mergebot: A merge operation targeting our version blocks us

File:
1 edited

Legend:

Unmodified
Added
Removed
  • mergebot/trunk/mergebot/mergebotdaemon.py

    r17 r18  
    7171                    if task.action == 'merge' and task.version == self.version:
    7272                        is_blocked = True
     73                # A merge operation targeting our version blocks us
     74                if task.action == 'merge' and task.version == self.version:
     75                    is_blocked = True
    7376                # If there is another queued operation for this same ticket,
    7477                # that task blocks this one
    7578                if self.ticket == task.ticket:
    7679                    is_blocked = True
     80
    7781                if is_blocked:
    7882                    self.blocked_by.append(task)
Note: See TracChangeset for help on using the changeset viewer.