blob: e0a349fade63b4382a77558b0bea9c2e7bf4d275 [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|c\xfefoo1|4|1||y\xfel\xfed\xfe12\xfe1|0|1|false
addr|c\xfefoo1|5|2|4|y\xfel\xfed\xfe11\xfe1|0|1|false
addr|c\xfefoo1|6|5||y\xfel\xfed\xfe11\xfe2|0|1|false