summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-02-20 14:45:43 -0600
committerJeff Carr <[email protected]>2024-02-20 14:45:43 -0600
commit2a19cd5eefd1e31ea2e7b1e46831943f8142a04a (patch)
tree237d3ac05365027ce731db2d18759bcad2328c27 /merge.go
parente1e81ab2bf60a3581555b3aed3898ee923756468 (diff)
finally rename back to 'Update'
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/merge.go b/merge.go
index 9f2a512..2d9a931 100644
--- a/merge.go
+++ b/merge.go
@@ -22,11 +22,11 @@ func (rs *RepoStatus) MergeUserToDevel() bool {
if rs.DoAll(all) {
log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
- rs.UpdateNew()
+ rs.updateNew()
return true
}
// DoAll failed
- rs.UpdateNew()
+ rs.updateNew()
return false
}
@@ -44,11 +44,11 @@ func (rs *RepoStatus) MergeDevelToMaster() bool {
if rs.DoAll(all) {
log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
- rs.UpdateNew()
+ rs.updateNew()
return true
}
// DoAll failed
- rs.UpdateNew()
+ rs.updateNew()
return false
}