| # 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|1234|4|1||VeyronLaptop:10:1:0|0|1|false |
| addr|1234|5|2|4|VeyronPhone:10:1:0|0|1|false |
| addr|1234|6|5||VeyronPhone:10:1:1|0|1|false |
