r11178: add some logic functions for the replica_vs_replica conflict handling
authorStefan Metzmacher <metze@samba.org>
Wed, 19 Oct 2005 09:41:54 +0000 (09:41 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:44:56 +0000 (13:44 -0500)
commite4edeeaa0a808c6bcdf022eec1257e796c1c0700
treeb892339ae9206398470d1b02bbc48c6e0b78b4e3
parent7545e4e7160864f5feedd35cf90507e47d7cf469
r11178: add some logic functions for the replica_vs_replica conflict handling
to our winsrepl server, but it handles only the simple cases (without merging)
and we still didn't apply records to our wins.ldb, we just print out what we would do

metze
source/wrepl_server/wrepl_apply_records.c