diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2010-12-08 16:11:19 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2010-12-08 16:11:19 +0000 |
| commit | 2b6049692b0b76fa60c1d0e1adc99fe7b0888054 (patch) | |
| tree | 85d41396b1b9eca87d39deb7206372b1ef47ccf2 /src/couchdb/couch_server.erl | |
| parent | 268fbeb6ab1e3374127249fa1bea2cd50021bd6b (diff) | |
Prefer values from old tree when merging, COUCHDB-968
This commit represents a substantial refactor of the key tree merging
logic, some of which is not strictly necessary for the resolution of
COUCHDB-968.
Two etap test cases checking the ability to merge in a non-linear tree
are removed because the functionality is no longer supported. CouchDB
only ever merged a linear revision history into an existing revision
tree.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1043478 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server.erl')
0 files changed, 0 insertions, 0 deletions