redo the merge code

1 files changed, 29 insertions, 15 deletions

diff --git a/merge.go b/merge.go
index ab6410e..26526b5 100644
--- a/merge.go
+++ b/merge.go
@@ -8,26 +8,38 @@ import (
 	"go.wit.com/widget"
 )
 
-func (rs *RepoStatus) RunDevelMergeB() bool {
+func (rs *RepoStatus) MergeUserToDevel() bool {
 	startbranch := rs.GetCurrentBranchName()
-	master := rs.mainWorkingName.String()
-	log.Warn("RunDevelMergeB() checking out master branch", master)
-	rs.CheckoutBranch(master)
-	newbranch := rs.GetCurrentBranchName()
-	if newbranch != master {
-		log.Warn("RunDevelMergeB() something went wrong switching branch:", master)
-		log.Warn("RunDevelMergeB() start working name =", startbranch)
-		log.Warn("RunDevelMergeB() current working name =", newbranch)
+	/*
+	devel := rs.GetDevelBranchName()
+	if ! rs.CheckoutBranch(devel) {
+		log.Warn("MergeUserToDevel() devel checkout failed", devel)
 		return false
 	}
-	log.Warn("RunDevelMergeB() running runGitCommands()")
-	if !rs.runGitCommands(true) {
-		log.Warn("RunDevelMergeB() SOMETHING WENT WRONG")
+	newbranch := rs.GetCurrentBranchName()
+	if newbranch != devel {
+		log.Warn("MergeUserToDevel() devel checkout failed", devel)
 		return false
 	}
+	*/
+	devel := rs.GetDevelBranchName()
+	user := rs.GetUserBranchName()
+
+	log.Info("MergeUserToDevel() checking out", devel, "started on", startbranch, "merge", user)
+
+	var all [][]string
+	all = append(all, []string{"git", "checkout", devel})
+	all = append(all, []string{"git", "merge", user})
+	all = append(all, []string{"git", "push"})
+
+	if rs.DoAll(all) {
+		log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
+		rs.UpdateNew()
+		return true
+	}
+	// DoAll failed
 	rs.UpdateNew()
-	log.Warn("RunDevelMergeB() THINGS SEEM OK runGitCommands() returned true.")
-	return true
+	return false
 }
 
 func (rs *RepoStatus) runReleaseVersionB() bool {
@@ -49,11 +61,12 @@ func (rs *RepoStatus) runReleaseVersionB() bool {
 }
 
 func (rs *RepoStatus) runFullAutomation() bool {
-	if !rs.RunDevelMergeB() {
+	if !rs.MergeUserToDevel() {
 		log.Warn("THINGS FAILED returned false")
 		return false
 	}
 	log.Warn("THINGS SEEM OK returned true. can run this again?")
+	/*
 	log.Warn("develMerge =", rs.develMergeB.String())
 	label := "merge devel into " + rs.GetMasterBranchName()
 	if label == rs.develMergeB.String() {
@@ -63,6 +76,7 @@ func (rs *RepoStatus) runFullAutomation() bool {
 			return false
 		}
 	}
+	*/
 	if rs.develMergeB.String() == "ready to release" {
 		log.Warn("THINGS SEEM OK ready to release")
 		if rs.releaseVersion.String() == "Release!" {