Implement text and binary merge algorithms, also with baseline te…

…sts for correctness.
GitoxideLabs · Sep 25, 2024 · ca465ab · ca465ab
1 parent b96d11f
commit ca465ab
Show file tree

Hide file tree

Showing 9 changed files with 1,481 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml
@@ -39,6 +39,10 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
 
 document-features = { version = "0.2.0", optional = true }
 
+[dev-dependencies]
+gix-testtools = { path = "../tests/tools" }
+pretty_assertions = "1.4.0"
+
 [package.metadata.docs.rs]
 all-features = true
 features = ["document-features"]
diff --git a/gix-merge/src/blob/builtin_driver.rs b/gix-merge/src/blob/builtin_driver.rs
diff --git a/gix-merge/src/blob/platform.rs b/gix-merge/src/blob/platform.rs
@@ -137,7 +137,7 @@ pub mod merge {
         pub other: ResourceRef<'parent>,
     }
 
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+    #[derive(Copy, Clone, Debug, Eq, PartialEq)]
     pub struct Options {
         /// If `true`, the resources being merged are contained in a virtual ancestor,
         /// which is the case when merge bases are merged into one.

diff --git a/gix-merge/tests/fixtures/generated-archives/text-baseline.tar b/gix-merge/tests/fixtures/generated-archives/text-baseline.tar