| Raja Daoud | 65e68b8 | 2015-06-11 16:33:33 -0700 | [diff] [blame^] | 1 | # Update an object remotely three times triggering one conflict after |
| 2 | # it was created locally up to v3 (i.e. assume the remote sync received | ||||
| 3 | # it from the local sync at v2, then updated separately). | ||||
| 4 | # The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted> | ||||
| 5 | |||||
| 6 | addr|1234|4|2||VeyronPhone:10:1:0|0|1|false | ||||
| 7 | addr|1234|5|4||VeyronPhone:10:1:1|0|1|false | ||||
| 8 | addr|1234|6|5||VeyronPhone:10:1:2|0|1|false | ||||