VOL-1174: Ported transaction support to go data model
Change-Id: I4cabefac36c95f690aa121c71f36b6aaf41180b0
diff --git a/db/model/node.go b/db/model/node.go
index 77e0cc7..0a77fff 100644
--- a/db/model/node.go
+++ b/db/model/node.go
@@ -15,6 +15,9 @@
*/
package model
+// TODO: proper error handling
+// TODO: proper logging
+
import (
"fmt"
"github.com/golang/protobuf/proto"
@@ -590,7 +593,7 @@
childBranch := rev.GetBranch()
if childBranch.Txid == txid {
- rev = childBranch.Node.mergeTxBranch(txid, dryRun)
+ rev, _ = childBranch.Node.mergeTxBranch(txid, dryRun)
}
return rev
@@ -598,7 +601,7 @@
return f
}
-func (n *Node) mergeTxBranch(txid string, dryRun bool) Revision {
+func (n *Node) mergeTxBranch(txid string, dryRun bool) (Revision, error) {
srcBranch := n.Branches[txid]
dstBranch := n.Branches[NONE]
@@ -613,7 +616,8 @@
delete(n.Branches, txid)
}
- return rev
+ // TODO: return proper error when one occurs
+ return rev, nil
}
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Diff utility ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~