git.samba.org / jra / samba / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e8118ad) | patch
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)
commit50030d5c4fe70de7defa2b513664f83d9ccd47c9
treeaf385573405690c233717a5d4ea4b4a11ef4ca14tree
parente8118ad3b0505534d68ccbef7a2cff54a9705ebbcommit | diff
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
(This used to be commit e4edeeaa0a808c6bcdf022eec1257e796c1c0700)
source4/wrepl_server/wrepl_apply_records.c diff | blob | history
Experimental branches for jra