Lines Matching refs:merge
143 /* ### nothing to merge right now... */
4322 if (doc == NULL || !dav_validate_root(doc, "merge")) {
4326 "DAV:merge element.");
4333 "The DAV:merge element must contain a DAV:source "
4372 no_auto_merge = dav_find_child(doc->root, "no-auto-merge") != NULL;
4377 /* ### check RFC. I believe the DAV:merge element may contain any
4382 ### which can be passed to the checkout() and merge() hooks. */
4412 /* Do the merge, including any response generation. */
4413 if ((err = (*vsn_hooks->merge)(resource, source_resource,
4428 /* the response was fully generated by the merge() hook. */
4908 dav_merge_server_config, /* merge server config */