attempting to set pb repo state

1 files changed, 6 insertions, 5 deletions

diff --git a/windowRepos.go b/windowRepos.go
index bc84893..7d47c1a 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -159,24 +159,25 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
 	for loop.Scan() {
 		repo := loop.Next()
 		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
-			log.Info("skipping readonly", repo.GetFullPath())
+			// log.Info("skipping readonly", repo.GetFullPath())
 			continue
 		}
 		if repo.IsDirty() {
 			log.Info("skipping dirty", repo.GetFullPath())
 			continue
 		}
-		if repo.GetCurrentBranchName() != repo.GetDevelBranchName() {
-			log.Info("not on devel branch", repo.GetFullPath())
+		if repo.GetDevelVersion() != repo.GetUserVersion() {
+			log.Info("devel and user branch are different", repo.GetFullPath())
 			continue
 		}
 		if repo.GetDevelVersion() == repo.GetMasterVersion() {
-			log.Info("devel and master branch are the same", repo.GetFullPath())
+			// log.Info("devel and master branch are the same", repo.GetFullPath())
 			continue
 		}
 		if result, err := repo.MergeDevelToMaster(); err == nil {
 			log.Warn("MERGE WORKED", repo.GetFullPath())
-			continue
+			// continue
+			return true
 		} else {
 			log.Warn("THINGS FAILED ", repo.GetFullPath())
 			log.Warn("err", err)