diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2010-12-08 15:48:46 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2010-12-08 15:48:46 +0000 |
| commit | eb3d803e24e3b9f09a037c48cbac15a356067772 (patch) | |
| tree | 63c427223db6f04243a59f12670d4cdd84c70b0a /src/erlang-oauth | |
| parent | 6ad57b061f57c4def54897f759772b7eae6d7ac3 (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.1.x@1043460 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/erlang-oauth')
0 files changed, 0 insertions, 0 deletions