From 1848af6d326fc450f620bac46da453ac786ceb06 Mon Sep 17 00:00:00 2001
From: Hassan Abedi <cogitator.tech@gmail.com>
Date: Thu, 4 Jun 2026 11:00:59 +0200
Subject: [PATCH] Update Geomerge to current head of `main`

---
 Cargo.lock        | 81 ++++++++++++++++++++++++++++++++++++++++++++++-
 external/geomerge |  2 +-
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99b5379..206ca92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
 [[package]]
 name = "atomic-polyfill"
 version = "1.0.3"
@@ -26,12 +38,36 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
+[[package]]
+name = "blake3"
+version = "1.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+ "cpufeatures",
+]
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "cc"
+version = "1.2.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+dependencies = [
+ "find-msvc-tools",
+ "shlex 2.0.1",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -62,6 +98,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "critical-section"
 version = "1.2.0"
@@ -92,6 +143,12 @@ version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
 [[package]]
 name = "geolog-lang"
 version = "0.1.0"
@@ -104,13 +161,16 @@ dependencies = [
 name = "geomerge"
 version = "0.1.0"
 dependencies = [
+ "blake3",
  "geolog-lang",
+ "hex",
  "hexane",
+ "leb128",
  "postcard",
  "rustyline",
  "serde",
  "serde_json",
- "shlex",
+ "shlex 1.3.0",
  "tracing",
  "tracing-subscriber",
 ]
@@ -146,6 +206,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
 [[package]]
 name = "hexane"
 version = "1.0.0-alpha.1"
@@ -286,6 +352,13 @@ dependencies = [
 name = "query-ops"
 version = "0.1.0"
 
+[[package]]
+name = "query-storage"
+version = "0.1.0"
+dependencies = [
+ "query-ops",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.45"
@@ -422,6 +495,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
 [[package]]
 name = "smallvec"
 version = "1.15.1"
diff --git a/external/geomerge b/external/geomerge
index d8f60cd..023a863 160000
--- a/external/geomerge
+++ b/external/geomerge
@@ -1 +1 @@
-Subproject commit d8f60cdb15683f1036519003ea6c557dcee05776
+Subproject commit 023a86391f3399a7eb8c91356dab7d4feb9fa76f