crash.software
Projects
Pull Requests
Issues
Builds
dolt
Code
Files
Commits
Branches
Tags
Pull Requests
Code Comments
Code Compare
Issues
List
Boards
Milestones
Builds
Statistics
Contributions
Source Lines
Child Projects
Projects
STRLCPY
dolt
Files
🤬
Sign In
e87a8262
ROOT
/
go
/
libraries
/
doltcore
/
merge
/
merge_rows.go
Search
History
430 lines
|
ISO-8859-1
|
11 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
MergeOpts
IsCherryPick
:
bool
TableMerger
name
:
string
leftTbl
:
*doltdb.Table
rightTbl
:
*doltdb.Table
ancTbl
:
*doltdb.Table
leftSch
:
schema.Schema
rightSch
:
schema.Schema
ancSch
:
schema.Schema
rightSrc
:
doltdb.Rootish
ancestorSrc
:
doltdb.Rootish
vrw
:
types.ValueReadWriter
ns
:
tree.NodeStore
tableHashes
()
:
(left, right, anc hash.Hash, err error)
RootMerger
left
:
*doltdb.RootValue
right
:
*doltdb.RootValue
anc
:
*doltdb.RootValue
rightSrc
:
doltdb.Rootish
ancSrc
:
doltdb.Rootish
vrw
:
types.ValueReadWriter
ns
:
tree.NodeStore
NewMerger
( left, right, anc *doltdb.RootValue, rightSrc, ancestorSrc doltdb.Rootish, vrw types.ValueReadWriter, ns tree.NodeStore, )
:
(*RootMerger, error)
setConflicts
(ctx context.Context, cons durable.ConflictIndex, tbl, mergeTbl, ancTbl, tableToUpdate *doltdb.Table)
:
(*doltdb.Table, error)
calcTableMergeStats
(ctx context.Context, tbl *doltdb.Table, mergeTbl *doltdb.Table)
:
(MergeStats, error)
*RootMerger
MergeTable
(ctx context.Context, tblName string, opts editor.Options, mergeOpts MergeOpts)
:
(*doltdb.Table, *MergeStats, error)
makeTableMerger
(ctx context.Context, tblName string)
:
(TableMerger, error)
maybeShortCircuit
(ctx context.Context, tm TableMerger, opts MergeOpts)
:
(*doltdb.Table, *MergeStats, error)
All occurrences
Please wait...
Page is in error, reload to recover