check if merge should be donev0.22.83

1 files changed, 15 insertions, 1 deletions

diff --git a/doGui.go b/doGui.go
index 6d86546..ca62a32 100644
--- a/doGui.go
+++ b/doGui.go
@@ -391,7 +391,21 @@ func mergeUserToDevel(doit bool) {
 	all := me.found.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
-		log.Info("repo:", repo.GetGoPath())
+		bruser := repo.GetUserBranchName()
+		brdevel := repo.GetDevelBranchName()
+
+		if repo.GetUserVersion() == "uerr" {
+			// no user branch
+			return
+		}
+		log.Info("trying", bruser, repo.GetUserVersion())
+
+		b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero
+		if b1 == 0 {
+			// log.Info("User is already merged into Devel", repo.GetGoPath(), cmd)
+			return
+		}
+		log.Info("merging user into devel repo:", repo.GetGoPath())
 		if result, err := repo.MergeToDevel(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())
 			for _, line := range result.Stdout {