Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

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: 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 574be32dc59813a94134726c158cf1bc24b81038 1 parent d9ad14b
@kocolosk kocolosk authored Robert Newson committed
Showing with 1 addition and 0 deletions.
  1. +1 −0  apps/couch/src/couch_key_tree.erl
1  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) ->
Please sign in to comment.
Something went wrong with that request. Please try again.