builds and seems to work still

1 files changed, 19 insertions, 10 deletions

diff --git a/windowRepos.go b/windowRepos.go
index 563711f..01cd54a 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -107,21 +107,25 @@ func (r *repoWindow) repoMenu() *gui.Node {
 		r.Enable()
 	})
 
+	box2.NewButton("test master merge", func() {
+		r.Disable()
+		if !r.mergeAllDevelToMain() {
+			return
+		}
+		r.Enable()
+	})
+
 	box2.NewButton("show apps", func() {
 		loop := me.repos.View.ReposSortByName()
 		for loop.Scan() {
-			repo := loop.Repo()
-			rtype := repo.Status.RepoType()
-			switch rtype {
-			case "'binary'":
+			var repo *repolist.RepoRow
+			repo = loop.Repo()
+			if repo.IsBinary() {
 				// log.Info(repo.Status.Path(), "compile here. Show()")
 				repo.Show()
-			case "'library'":
+			} else {
 				// log.Info(repo.Status.Path(), "library here. Hide()")
 				repo.Hide()
-			default:
-				log.Info(repo.Status.Path(), "unknown type", rtype)
-				// repo.Hide()
 			}
 		}
 	})
@@ -151,9 +155,14 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
 			log.Info("not on devel branch", repo.GetFullPath())
 			continue
 		}
-		if result, err := repo.MergeDevelToMaster(); err == nil {
-			log.Warn("THINGS SEEM OK", repo.GetFullPath())
+		if repo.GetDevelVersion() == repo.GetMasterVersion() {
+			log.Info("devel and master branch are the same", repo.GetFullPath())
 			continue
+		}
+		if result, err := repo.MergeDevelToMaster(); err == nil {
+			log.Warn("A SINGLE MERGE WORKED. PAUSING", repo.GetFullPath())
+			return true
+			// continue
 		} else {
 			log.Warn("THINGS FAILED ", repo.GetFullPath())
 			log.Warn("err", err)