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