summaryrefslogtreecommitdiff
path: root/doMerge.go
diff options
context:
space:
mode:
Diffstat (limited to 'doMerge.go')
-rw-r--r--doMerge.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/doMerge.go b/doMerge.go
index f049c5c..784b213 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -12,14 +12,17 @@ import (
func doMerge() error {
if err := loadConfigfile(); err != nil {
- badExit(err)
+ return err
}
mergePatchsets()
for pset := range me.all.IterAll() {
showPatchsets(pset)
}
- // savePatchsets()
+ if err := savePatchsets(); err != nil {
+ log.Warn("savePatchsets() failed", err)
+ return err
+ }
return nil
}
@@ -59,7 +62,7 @@ func addPatchset(filename string, pb *forgepb.Patchset) {
var newpb *forgepb.Patchset
newpb = proto.Clone(pb).(*forgepb.Patchset)
if newpb != nil {
- me.all.Append(newpb)
+ me.all.Patchsets = append(me.all.Patchsets, newpb)
}
}
}