MergeTestCase
From Foxcloud Wiki
Contents |
[edit]
Test case for merging on initial synchronisation
[edit]
Computer A
- Bookmarks Toolbar Folder
- A BM1
- A Live Bookmark 0
- A BM2
- FOLDER
- A F BM1
- A F BM2
- A F BM3
- A F BM4
- A F1
- A F1 BM1
- A F1 BM2
- A F1 BM3
- A F1 BM4
[edit]
Computer B
- B BM0
- Bookmarks Toolbar Folder
- B Live
- B BM1
- B F1
- B BM2
- B BM3
- FOLDER
- B F BM1
- B F BM2
- B F BM3
- B F2
- B BM4
- B BM5
[edit]
Action:
- Setup and synchronize computer A
- Setup and synchronize computer B using merge and remote as master
[edit]
Result after merge
according to bookmarks.html on computer B
- Bookmarks Toolbar Folder
- B Live
- A BM1
- A BM1
- B Live
- B F1
- B BM2
- B BM3
- A BM2
- FOLDER
- B F BM1
- B F BM2
- B F BM3
- FOLDER
- A F BM1
- A F BM2
- A F BM3
- A F BM4
- B F BM1
- B F BM2
- B F BM3
- B F1
- B BM2
- B BM3
- A F1
- A F1 BM1
- A F1 BM2
- A F1 BM3
- A F1 BM4
- B BM0
- B F2
- B BM4
- B BM5
