jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more patch tracking

This commit is contained in:
Jeff Carr 2025-09-05 01:59:00 -05:00
parent 04028e6181
commit 809dfe7fa3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doMerge.go
View File

@ -25,6 +25,11 @@ func doMergeDevel() (*gitpb.Repos, error) {
err = fmt.Errorf("checkout devel failed") err = fmt.Errorf("checkout devel failed")
break break
} }
// hash differences when merging user into devel branch
out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName())
for i, hash := range out {
log.Info("MERGE HASH FROM USER TO DEVEL", i, hash)
}
if _, err := repo.MergeToDevel(); err != nil { if _, err := repo.MergeToDevel(); err != nil {
log.Info("merge from user failed", repo.GetGoPath(), err) log.Info("merge from user failed", repo.GetGoPath(), err)
err = fmt.Errorf("merge from user failed") err = fmt.Errorf("merge from user failed")