feat: use new version of keepass-rs merge feature

louib · Dec 29, 2023 · 99ba4e6 · 99ba4e6
1 parent bf20f51
commit 99ba4e6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,6 @@ anyhow = { version = "1" }
 
 [dependencies.keepass]
 git = "https://github.com/sseemayer/keepass-rs"
-branch = "add_merge_feature"
+branch = "add_merge_feature_refactor"
 # path = "../keepass-rs"
-features = ["save_kdbx4"]
+features = ["save_kdbx4", "merge"]
diff --git a/src/main.rs b/src/main.rs
@@ -81,7 +81,7 @@ fn main() -> Result<std::process::ExitCode> {
         }
     }?;
 
-    let merge_result = match destination_db.root.merge(&source_db.root) {
+    let merge_result = match destination_db.merge(&source_db) {
         Ok(r) => r,
         Err(e) => {
             eprintln!("{}", e);