diff options
Diffstat (limited to 'doMerge.go')
| -rw-r--r-- | doMerge.go | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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) } } } |
