Skip to content

Commit

Permalink
Add an investigation TODO in merge_local_folder_manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
vxgmichel committed Oct 11, 2024
1 parent d183116 commit 863f524
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libparsec/crates/client/src/workspace/merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,15 @@ pub(super) fn merge_local_folder_manifest(

// Both the remote and the local have changed

// The following case was present in the original v2 code.
// TODO: investigate why it's not present anymore and check whether
// it is still relevant.
// ```python
// # All the local changes have been successfully uploaded
// if local_manifest.match_remote(remote_manifest):
// return local_from_remote
// ```

// 4) The remote changes are ours (our current local changes occurs while
// we were uploading previous local changes that became the remote changes),
// simply acknowledge the remote changes and keep our local changes
Expand Down

0 comments on commit 863f524

Please sign in to comment.