about to attempt a merge to devel again

1 files changed, 6 insertions, 21 deletions

diff --git a/windowRepos.go b/windowRepos.go
index 43a2483..5d25e08 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -104,26 +104,6 @@ func (r *repoWindow) repoMenu() *gui.Node {
 	r.mergeDevel = box2.NewButton("merge to devel", func() {
 		r.Disable()
 		defer r.Enable()
-		if IsAnythingDirty() {
-			log.Info("You can't apply patches when repos are dirty")
-			me.forge.PrintHumanTable(me.found)
-			return
-		}
-		/*
-			if !r.mergeAllUserToDevel() {
-				return
-			}
-		*/
-	})
-
-	r.mergeMaster = box2.NewButton("merge to master", func() {
-		r.Disable()
-		// r.mergeAllDevelToMain()
-		r.Enable()
-	})
-
-	box2.NewButton("test merge to devel", func() {
-		r.Disable()
 		loop := r.View.ReposSortByName()
 		for loop.Scan() {
 			// var repo *repolist.RepoRow
@@ -133,7 +113,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
 			}
 			repo := view.GetPb()
 			log.Info("repo:", repo.GetGoPath())
-			if result, err := repo.MergeUserToDevel(); err == nil {
+			if result, err := repo.MergeToDevel(); err == nil {
 				log.Warn("THINGS SEEM OK", repo.GetFullPath())
 			} else {
 				log.Warn("THINGS FAILED ", repo.GetFullPath())
@@ -151,6 +131,11 @@ func (r *repoWindow) repoMenu() *gui.Node {
 			view.Update()
 		}
 		me.forge.ConfigSave()
+	})
+
+	r.mergeMaster = box2.NewButton("merge to master", func() {
+		r.Disable()
+		// r.mergeAllDevelToMain()
 		r.Enable()
 	})