diff options
Diffstat (limited to 'doNormal.go')
| -rw-r--r-- | doNormal.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/doNormal.go b/doNormal.go index 731fe3d..78de104 100644 --- a/doNormal.go +++ b/doNormal.go @@ -157,22 +157,32 @@ func checkNormalRepoState(repo *gitpb.Repo) error { } } + if repo.IsBranchRemote(repo.GetUserBranchName()) { + log.Info(repo.FullPath) + panic("nuts") + } + // check to see if the user branch is behind the devel branch if repo.GetUserVersion() != repo.GetDevelVersion() { uver := repo.NewCompareTag(repo.GetUserBranchName()) dver := repo.NewCompareTag(repo.GetDevelBranchName()) if uver == nil { + log.Info(repo.FullPath, "uver == nil") // make user here (should have already happened) return ErrorNoUserBranch } if dver == nil { + log.Info(repo.FullPath, "dver == nil") // make dev here (should have already happened) return ErrorNoDevelBranch } - if uver.LessThan(dver) { + if len(dver.GreaterThan(uver)) == 0 { + log.Info(repo.FullPath, "usr < dev") repo.State = "usr < dev" // check if nothing new exists in user, then delete return ErrorLocalBehindDevel + } else { + repo.State = "normal" } // everything is fine } |