summaryrefslogtreecommitdiff
path: root/apps/couch
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2011-01-31 02:46:44 +0000
committerRobert Newson <robert.newson@cloudant.com>2012-11-14 15:41:46 +0000
commit574be32dc59813a94134726c158cf1bc24b81038 (patch)
tree79fce245f9e6f0f177e834b1b076fb392bf7e53c /apps/couch
parentd9ad14be41bc341ba507d629ef0bde5139cd8029 (diff)
Fix spurious declarations of new merge conflicts
This patch also adds extra tests of the key tree merging logic as well as edoc-formatted documentation for the module and a few of the merge functions. Closes COUCHDB-902. Thanks Paul Davis, Bob Dionne, Klaus Trainer. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1065471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'apps/couch')
-rw-r--r--apps/couch/src/couch_key_tree.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/couch/src/couch_key_tree.erl b/apps/couch/src/couch_key_tree.erl
index 5e24e0f7..57b99100 100644
--- a/apps/couch/src/couch_key_tree.erl
+++ b/apps/couch/src/couch_key_tree.erl
@@ -61,6 +61,7 @@
% partial trees arranged by how much they are cut off.
+%% @doc Merge a path with a list of paths and stem to the given length.
-spec merge([path()], path(), pos_integer()) -> {[path()],
conflicts | no_conflicts}.
merge(Paths, Path, Depth) ->