Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add additional tests for merge_local_folder_manifest #7756

Merged
merged 11 commits into from
Aug 9, 2024
Merged

Add additional tests for merge_local_folder_manifest #7756

merged 11 commits into from
Aug 9, 2024

Commits on Aug 9, 2024

  1. Add additional tests for merge_local_folder_manifest

    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    15e6c8a View commit details
    Browse the repository at this point in the history

  2. Split local manifest tests file into file/user/folder

    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    b620aff View commit details
    Browse the repository at this point in the history

  3. Improve local folder manifest tests

    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    be75ad5 View commit details
    Browse the repository at this point in the history

  4. Improve local folder manifest methods documentation & merge_local_fol… 

    …der_manifest internals
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    9516ffc View commit details
    Browse the repository at this point in the history

  5. Improve get_conflict_filename (internally used by `merge_local_fold… 

    …er_manifest`) to support name with leading dot, and add tests
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    f80f9ea View commit details
    Browse the repository at this point in the history

  6. Add test LocalFolderManifest::to_remote when containing confined en… 

    …tries
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    4685f3f View commit details
    Browse the repository at this point in the history

  7. Improve merge_local_folder_manifest tests

    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    7874f03 View commit details
    Browse the repository at this point in the history

  8. Fix merge_local_folder_manifest returned confinment points when remot… 

    …e manifest is from local author
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    49d1234 View commit details
    Browse the repository at this point in the history

  9. Rework merge_file_manifest to support parent merging with non-conflic… 

    …ting local modification, and add plenty of tests \o/
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    274c75a View commit details
    Browse the repository at this point in the history

  10. Disable additional tests on merge_folder_manifest that currently do… 

    …esn't pass...

See issue #7924 tracking the re-enabling
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c5656b0 View commit details
    Browse the repository at this point in the history

  11. Disable tests on LocalFolderManifest::apply_prevent_sync_pattern th… 

    …at currently doesn't pass...

See issue #7924 tracking the re-enabling
    @touilleMan
    touilleMan committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    9937aa2 View commit details
    Browse the repository at this point in the history