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.

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

Web doesn't pick up changes from desktop #159043

Open
jrieken opened this issue Aug 24, 2022 · 2 comments
Open

Web doesn't pick up changes from desktop #159043

jrieken opened this issue Aug 24, 2022 · 2 comments
Assignees
Labels
cloud-changes continue-working-on feature-request Request for new features or functionality
Milestone

Comments

@jrieken
Copy link
Member

jrieken commented Aug 24, 2022

Testing #158798

  • started with vscode-wasm, added a file
  • continue on desktop and the new file showed up
  • (time passed, new insider release, other work happened etc pp)
  • make more changes on desktop
  • reload window in web but I only see the added file, not the additional changes

Log from WEB

[2022-08-24 13:00:59.680] [editsessions] [info] Resuming edit session...
[2022-08-24 13:01:00.298] [editsessions] [info] Searching for existing authentication session with ID 7c97d519-9d5b-4ee9-a96f-3a7eea3171f0
[2022-08-24 13:01:00.568] [editsessions] [info] Found existing authentication session with ID 7c97d519-9d5b-4ee9-a96f-3a7eea3171f0
[2022-08-24 13:01:01.900] [editsessions] [info] Matching identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"} against edit session folder identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"}...
[2022-08-24 13:01:01.955] [editsessions] [info] Deleting edit session with ref da72c3ac-39d9-4a9f-adda-99cbb193ad70 after successfully applying it to current workspace...
[2022-08-24 13:01:02.481] [editsessions] [info] Deleted edit session with ref da72c3ac-39d9-4a9f-adda-99cbb193ad70.

Log from DESKTOP

[2022-08-24 09:25:42.730] [editsessions] [info] Resuming edit session...
[2022-08-24 09:25:42.763] [editsessions] [info] Resuming edit session...
[2022-08-24 09:25:43.551] [editsessions] [info] Searching for existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:43.608] [editsessions] [info] Searching for existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:44.663] [editsessions] [info] Resuming edit session...
[2022-08-24 09:25:44.663] [editsessions] [info] Searching for existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:46.459] [editsessions] [info] Found existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:46.496] [editsessions] [info] Found existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:46.675] [editsessions] [info] Found existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 09:25:51.141] [editsessions] [info] Matching identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"} against edit session folder identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"}...
[2022-08-24 09:25:51.580] [editsessions] [info] Matching identity {"remote":"git@github.com:microsoft/vscode.git","ref":"main","sha":"7ed02a69658fc07f08740b98fa0d8d96c1a61ed4"} against edit session folder identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"}...
[2022-08-24 09:25:51.580] [editsessions] [info] Skipping applying 1 changes from edit session with ref 65501047-369b-4137-b50f-d80481068abc as no matching workspace folder was found.
[2022-08-24 09:25:52.077] [editsessions] [info] Matching identity {"remote":"git@github.com:microsoft/vscode-github-issue-notebooks.git","ref":"main","sha":"2d5282dc56f0b4db77041a8c1de4cf9491d138d8"} against edit session folder identity {"remote":"https://github.com/microsoft/vscode-wasm","ref":"main","sha":"805feaf2fbd578f4bc1bac898856e954822aa163"}...
[2022-08-24 09:25:52.077] [editsessions] [info] Skipping applying 1 changes from edit session with ref 65501047-369b-4137-b50f-d80481068abc as no matching workspace folder was found.
[2022-08-24 09:26:18.551] [editsessions] [info] Deleting edit session with ref 65501047-369b-4137-b50f-d80481068abc after successfully applying it to current workspace...
[2022-08-24 09:26:18.720] [editsessions] [info] Deleted edit session with ref 65501047-369b-4137-b50f-d80481068abc.
[2022-08-24 11:07:09.940] [editsessions] [info] Resuming edit session...
[2022-08-24 11:07:10.378] [editsessions] [info] Searching for existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89
[2022-08-24 11:07:12.243] [editsessions] [info] Found existing authentication session with ID 6d5ab2c8-4344-41ad-a8f0-4dccc45c1b89

@joyceerhl
Copy link
Contributor

make more changes on desktop
reload window in web but I only see the added file, not the additional changes

This is as designed at the moment and ties into the 'roaming workspaces' concept that we have talked about in the past with @sandy081 @bpasero.

Currently the conditions for us to store an edit session are:

  • The user manually triggers Store Current Edit Session
  • The user triggers Continue Working On with "workbench.experimental.editSessions.enabled": true which we use to determine that an edit session should be stored
  • The user configures "workbench.experimental.editSessions.autoStore": "onShutdown": Auto-store edit sessions on window close #158409

The next step would be to see if we can periodically store edit sessions, as @Tyriar mentioned in standup this is conceptually similar to autoSave afterDelay. The biggest challenge here is how to deal with multiple clients simultaneously working on an edit session, since we want to avoid an experience where the user is constantly being asked to resolve conflicts in their workspace.

@joyceerhl joyceerhl added the feature-request Request for new features or functionality label Aug 24, 2022
@joyceerhl joyceerhl added this to the Backlog milestone Aug 24, 2022
@jrieken
Copy link
Member Author

jrieken commented Aug 25, 2022

Yeah, I believe I misunderstood how this feature actually works. Ideas for clarity

  • show a more explicit message in the instance from which I am continuing from (origin machine)
  • consider to undo the changes from the origin machine since I am continuing on them in the target machine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cloud-changes continue-working-on feature-request Request for new features or functionality
Projects
None yet
Development

No branches or pull requests

2 participants