Merge branch 'master' into spread_routes

test/apps/basics/src/routes/dirs/bar/[a].svelte

@@ -0,0 +1,3 @@
+<h1>A page</h1>
+
+<a href="dirs/foo/xyz">same segment</a>

test/apps/basics/src/routes/dirs/foo/[b].svelte

@@ -0,0 +1 @@
+<h1>B page</h1>

test/apps/basics/test.ts

@@ -298,6 +298,17 @@ describe('basics', function() {
 			await page.evaluate(() => document.body.textContent),
 			'xyz,abc,qwe'
 		);
+  });
+  
+	it('navigates between dynamic routes with same segments', async () => {
+		await page.goto(`${base}/dirs/bar/xyz`);
+		await start();
+
+		assert.equal(await title(), 'A page');
+
+		await page.click('[href="dirs/foo/xyz"]');
+		await wait(50);
+		assert.equal(await title(), 'B page');
 	});
   
 	it('runs server route handlers before page handlers, if they match', async () => {