From 39e4ce285d312062d38844da08d33b60421ba9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Sun, 7 Jun 2015 16:31:39 +0300
Subject: [PATCH] Pilot: After checking for new commits, switch back to old
 branch

---
 distrib/pilot.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/distrib/pilot.py b/distrib/pilot.py
index d6f521e8da..7ebdb96196 100755
--- a/distrib/pilot.py
+++ b/distrib/pilot.py
@@ -373,6 +373,7 @@ def doTask(task):
         
     elif task.startswith('check_'):
         if pilotcfg.ID == 'master':
+            oldBranch = currentBranch()
             branch = task[6:]
             msg("CHECK BRANCH: " + branch)
             autobuild('pull')
@@ -380,6 +381,9 @@ def doTask(task):
                 autobuild('pull')
             if checkBranchHeadForChanges():
                 newTask('buildfrom_' + branch, allClients=True)
+            else:
+                switchToBranch(oldBranch)
+                autobuild('pull')
         return True
 
     elif task == 'tag_build':