cmasone-attic e954427903 Go: add heuristic merge option to db.Commit() (#2759) ...

This patch adds an optional MergePolicy field to CommitOptions. It's a
callback. If the caller sets it, then the commit code will look for a
common ancestor between the Dataset HEAD and the provided Commit. If
the caller-provided Commit descends from HEAD, then Commit proceeds as
normal.
If it does not, but there is a common ancestor, the code runs
merge.ThreeWay() on the values of the provided Commit, HEAD, and the
common ancestor, invoking the MergePolicy callback to resolve
conflicts. If merge succeeds, a merge Commit is created that descends
from both HEAD and the caller-provided Commit. This becomes the new
HEAD of the Dataset.

Fixes #2534

2016-10-27 11:52:46 -07:00

..

caching_chunk_haver_test.go

Update license: Noms will be copyright Attic Labs. (#1976)

2016-07-05 22:07:42 -07:00

caching_chunk_haver.go

Update license: Noms will be copyright Attic Labs. (#1976)

2016-07-05 22:07:42 -07:00

commit_options.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

commit_test.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

commit.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

database_common.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

database_server.go

Replace d.Chk.True with d.PanicIfFalse (#2563)

2016-09-14 13:11:28 -07:00

database_test.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

database.go

JS: Add CommitOptions to commit method (#2677)

2016-10-06 13:14:41 -07:00

dataset_test.go

Factor out datas.ReadAbsolutePaths() (#2623)

2016-09-27 14:21:54 -07:00

dataset.go

Factor out datas.ReadAbsolutePaths() (#2623)

2016-09-27 14:21:54 -07:00

factory.go

Update license: Noms will be copyright Attic Labs. (#1976)

2016-07-05 22:07:42 -07:00

http_batch_store_test.go

Allow changes to different Datasets to proceed concurrently (#2533)

2016-09-14 13:56:30 -07:00

http_batch_store.go

LocalDatabase vends separate validating BatchStore (#2624)

2016-09-27 14:24:57 -07:00

local_batch_store.go

Add concurrency to use of ValidatingBatchingSink (#2684)

2016-10-10 15:33:35 -07:00

local_database.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

pull_test.go

Make Database a mutable API that vends immutable Datasets (#2617)

2016-09-26 12:18:14 -07:00

pull.go

Refactor Chunks and ChildValues API to work iteratively (#2599)

2016-09-30 16:53:00 -07:00

pulling.md

Go: Use unified ref-height-based Pull algorithm (#1722)

2016-06-08 08:57:48 -07:00

put_cache_test.go

OrderedPutCache.ExtractChunks writes to chan *chunks.Chunk rather than io.Writer (#2099)

2016-07-20 11:28:26 -07:00

put_cache.go

OrderedPutCache.ExtractChunks writes to chan *chunks.Chunk rather than io.Writer (#2099)

2016-07-20 11:28:26 -07:00

remote_database_client.go

Go: add heuristic merge option to db.Commit() (#2759)

2016-10-27 11:52:46 -07:00

remote_database_handlers_test.go

Fix crash in handleWriteValue (#2696)

2016-10-12 08:49:12 -07:00

remote_database_handlers.go

Fix crash in handleWriteValue (#2696)

2016-10-12 08:49:12 -07:00

serialize_hints_test.go

no functional changes, improving code quality (#2410)

2016-08-23 13:51:38 -04:00

serialize_hints.go

Replace d.Chk.True with d.PanicIfFalse (#2563)

2016-09-14 13:11:28 -07:00