/[Apache-SVN]
ViewVC logotype

Revision 1138676

Jump to revision: Previous Next
Author: davisp
Date: Wed Jun 22 23:08:02 2011 UTC (12 years, 10 months ago)
Changed paths: 4
Log Message: 
Backport of 1065471 from trunk.

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.

Changed paths

Path Details
Directorycouchdb/branches/1.0.x/ modified , props changed
Directorycouchdb/branches/1.0.x/etc/default/couchdb modified , props changed
Directorycouchdb/branches/1.0.x/src/couchdb/couch_key_tree.erl modified , text changed
Directorycouchdb/branches/1.0.x/test/etap/060-kt-merging.t modified , text changed
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26