Merge branch 'main' into reconnections-2

2022-12-02 19:09:33 +01:00 · 2022-12-02 19:09:33 +01:00 · 969c314315
commit 969c314315
parent 568de814aa ea03b48243
78 changed files with 2759 additions and 1281 deletions
--- a/crates/collab/src/integration_tests.rs
+++ b/crates/collab/src/integration_tests.rs
@ -5566,6 +5566,13 @@ async fn test_random_collaboration(
                                guest_client.username,
                                id
                            );
+                            assert_eq!(
+                                guest_snapshot.abs_path(),
+                                host_snapshot.abs_path(),
+                                "{} has different abs path than the host for worktree {}",
+                                guest_client.username,
+                                id
+                            );
                            assert_eq!(
                                guest_snapshot.entries(false).collect::<Vec<_>>(),
                                host_snapshot.entries(false).collect::<Vec<_>>(),