| Jiri Simsa | 5293dcb | 2014-05-10 09:56:38 -0700 | [diff] [blame] | 1 | # Update an object remotely three times without triggering a conflict |
| 2 | # after it was created locally up to v2 (i.e. assume the remote sync | ||||
| 3 | # received it from the local sync first, then updated it). | ||||
| 4 | # The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec> | ||||
| 5 | |||||
| 6 | addr|12345|3|2||VeyronPhone:1:0 | ||||
| 7 | addr|12345|4|3||VeyronPhone:1:1 | ||||
| 8 | addr|12345|5|4||VeyronPhone:1:2 | ||||