From de9427476d414560491fa4260407280435545ef7 Mon Sep 17 00:00:00 2001
From: Pratik Vyas <m@pd.io>
Date: Tue, 5 May 2015 09:44:03 +0530
Subject: [PATCH] reset cronjobs on upgrade and merge on switching branches

---
 bench/app.py   |  1 +
 bench/utils.py | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bench/app.py b/bench/app.py
index ea37ec15..10d40d4b 100644
--- a/bench/app.py
+++ b/bench/app.py
@@ -153,6 +153,7 @@ def switch_branch(branch, apps=None, bench='.', upgrade=False):
 		if os.path.exists(app_dir):
 			exec_cmd("git fetch upstream", cwd=app_dir)
 			exec_cmd("git checkout {branch}".format(branch=branch), cwd=app_dir)
+			exec_cmd("git merge upstream/{branch}".format(branch=branch), cwd=app_dir)
 
 	if version_upgrade and upgrade:
 		pre_upgrade(version_upgrade[0], version_upgrade[1])
diff --git a/bench/utils.py b/bench/utils.py
index cd690647..5cf6a651 100644
--- a/bench/utils.py
+++ b/bench/utils.py
@@ -372,14 +372,14 @@ def drop_privileges(uid_name='nobody', gid_name='nogroup'):
 
 def fix_prod_setup_perms(frappe_user=None):
 	files = [
-	"logs/web.error.log",
-	"logs/web.log",
-	"logs/workerbeat.error.log",
-	"logs/workerbeat.log",
-	"logs/worker.error.log",
-	"logs/worker.log",
-	"config/nginx.conf",
-	"config/supervisor.conf",
+		"logs/web.error.log",
+		"logs/web.log",
+		"logs/workerbeat.error.log",
+		"logs/workerbeat.log",
+		"logs/worker.error.log",
+		"logs/worker.log",
+		"config/nginx.conf",
+		"config/supervisor.conf",
 	]
 
 	if not frappe_user:
@@ -452,6 +452,7 @@ def post_upgrade(from_ver, to_ver, bench='.'):
 			generate_supervisor_config(bench=bench)
 			generate_nginx_config(bench=bench)
 			setup_procfile(bench=bench)
+			setup_backups(bench=bench)
 			print "As you have setup your bench for production, you will have to reload configuration for nginx and supervisor"
 			print "To complete the migration, please run the following commands"
 			print