Changeset 18
- Timestamp:
- Jun 10, 2009 3:24:20 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
mergebot/trunk/mergebot/mergebotdaemon.py
r17 r18 71 71 if task.action == 'merge' and task.version == self.version: 72 72 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 73 76 # If there is another queued operation for this same ticket, 74 77 # that task blocks this one 75 78 if self.ticket == task.ticket: 76 79 is_blocked = True 80 77 81 if is_blocked: 78 82 self.blocked_by.append(task)
Note: See TracChangeset
for help on using the changeset viewer.