blob: 4e0d2de2379029004af787df0c586b196c2b9593 [file] [log] [blame]
# Update an object remotely three times triggering a conflict with
# 2 graft points: v1 and v4. This assumes that the remote sync got
# v1, made its own conflicting v4 that it resolved into v5 (against v2)
# then made a v6 change. When the local sync gets back this info it
# sees 2 graft points: v1-v4 and v2-v5.
# The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted>
addr|tb:foo1|4|1||$sync:log:data:12:1|0|1|false
addr|tb:foo1|5|2|4|$sync:log:data:11:1|0|1|false
addr|tb:foo1|6|5||$sync:log:data:11:2|0|1|false