opam update fails between 4ae3c774e4 and latest master: OpamSystem.Internal_patch_error("Patch \"in directory /home/edwint/.opam/repo/test\" does not apply cleanly.")

[edwintorok]

Steps to reproduce with opam 2.5.1 (narrowed down to a smaller commit range):

This works:

git clone https://github.com/ocaml/opam-repository && cd opam-repository
git checkout 142525538e5694742be38a5edaf7d3d6051acaf8
opam repo remove testbug --all
opam repo add testbug .
git checkout d9cabb4c55
opam update testbug

This fails:

git clone https://github.com/ocaml/opam-repository && cd opam-repository
git checkout '142525538e5694742be38a5edaf7d3d6051acaf8^'
opam repo remove testbug --all
opam repo add testbug .
git checkout d9cabb4c55
opam update testbug

Interestingly running opam update testbug again works then (but this doesn't help with the original issue I had).

Although updating directly from 142525538e5694742be38a5edaf7d3d6051acaf8^ to 142525538e5694742be38a5edaf7d3d6051acaf8 works too.

FWIW updating the default https remote works, it is just using a git remote that fails.

$ opam --version
2.5.1
$ git --version
git version 2.54.0
$ patch --version
GNU patch 2.8

Although it looks like opam processes the patch using an OCaml implementation of patch, so the bug might be there.

[edwintorok]

Using the patch produced at the failed step above, and using patch to apply it works:

git checkout '142525538e5694742be38a5edaf7d3d6051acaf8^'
patch -p1 </home/edwint/.opam/log/git-diff-50052-c8dfd0

This is the part that fails to apply (I modified opatch to print the failing diff):

../opatch.3.1.1/_build/default/bin/opatch.exe -v -p 1 </home/edwint/.opam/log/git-diff-50052-c8dfd0
--- packages/checkseum/checkseum.0.5.2/opam
+++ packages/checkseum/checkseum.0.5.3/opam
@@ -31,7 +31,7 @@
-  "dune-configurator"
-  "optint"        {>= "0.3.0"}
-  "alcotest"      {with-test}
-  "bos"           {with-test}
-  "astring"       {with-test}
-  "fmt"           {with-test}
-  "fpath"         {with-test}
+  "dune-configurator"
+  "optint"        {>= "0.3.0"}
+  "alcotest"      {with-test}
+  "bos" {with-test & < "0.3.0"}
+  "astring"       {with-test}
+  "fmt"           {with-test}
+  "fpath"         {with-test}
@@ -43,13 +43,13 @@
-  "mirage-xen" {< "6.0.0"}
-  "ocaml-freestanding"
-]
-url {
-  src:
-    "https://github.com/mirage/checkseum/releases/download/v0.5.2/checkseum-0.5.2.tbz"
-  checksum: [
-    "sha256=9e5e4fd4405cb4a8b4df00877543251833e08a6499ef42ccb8dba582df0dafc8"
-    "sha512=b66261effaa561ce5cb8d92a3ec78565a5579bf3d3c4b7f08eba59998ac4d7f49ae9c240986c231b22b965c93a949a8a2e35edec42277ecb5602829945fba6db"
-  ]
-}
-x-commit-hash: "79867ddb97f347657ff2ec026da1d77ec7864db6"
-x-maintenance-intent: [ "(latest)" ]
+  "mirage-xen" {< "6.0.0"}
+  "ocaml-freestanding"
+]
+x-maintenance-intent: [ "(latest)" ]
+url {
+  src:
+    "https://github.com/mirage/checkseum/releases/download/v0.5.3/checkseum-0.5.3.tbz"
+  checksum: [
+    "sha256=b88c11994341213a35c23f34168bba7a74bf3f89051f77beb39d823adce1a531"
+    "sha512=e4a35bdb7956b8d30a317923e86c750c174a7804b115b823bf67f66cf6dde5e40f687693a2fa9fee78e0a5a426ee0d1deeea22a723114905d57a41fd473e8b0e"
+  ]
+}
+x-commit-hash: "8e7f01715191305d4b10a4f85a918a679e7d5345"

Fatal error: Patch "-" does not apply

Narrowing it down it looks like we first patch a file, then copy it, then patch it again:

diff --git b/packages/checkseum/checkseum.0.5.2/opam a/packages/checkseum/checkseum.0.5.2/opam
index ee42395e..4a3e5698 100644
--- b/packages/checkseum/checkseum.0.5.2/opam
+++ a/packages/checkseum/checkseum.0.5.2/opam
@@ -31,7 +31,7 @@ depends: [
   "dune-configurator"
   "optint"        {>= "0.3.0"}
   "alcotest"      {with-test}
-  "bos"           {with-test}
+  "bos" {with-test & < "0.3.0"}
   "astring"       {with-test}
   "fmt"           {with-test}
   "fpath"         {with-test}
diff --git b/packages/checkseum/checkseum.0.5.2/opam a/packages/checkseum/checkseum.0.5.3/opam
similarity index 82%
copy from packages/checkseum/checkseum.0.5.2/opam
copy to packages/checkseum/checkseum.0.5.3/opam
index ee42395e..7efff64e 100644
--- b/packages/checkseum/checkseum.0.5.2/opam
+++ a/packages/checkseum/checkseum.0.5.3/opam
@@ -31,7 +31,7 @@ depends: [
   "dune-configurator"
   "optint"        {>= "0.3.0"}
   "alcotest"      {with-test}
-  "bos"           {with-test}
+  "bos" {with-test & < "0.3.0"}
   "astring"       {with-test}
   "fmt"           {with-test}
   "fpath"         {with-test}
@@ -43,13 +43,13 @@ conflicts: [
   "mirage-xen" {< "6.0.0"}
   "ocaml-freestanding"
 ]
+x-maintenance-intent: [ "(latest)" ]
 url {
   src:
-    "https://github.com/mirage/checkseum/releases/download/v0.5.2/checkseum-0.5.2.tbz"
+    "https://github.com/mirage/checkseum/releases/download/v0.5.3/checkseum-0.5.3.tbz"
   checksum: [
-    "sha256=9e5e4fd4405cb4a8b4df00877543251833e08a6499ef42ccb8dba582df0dafc8"
-    "sha512=b66261effaa561ce5cb8d92a3ec78565a5579bf3d3c4b7f08eba59998ac4d7f49ae9c240986c231b22b965c93a949a8a2e35edec42277ecb5602829945fba6db"
+    "sha256=b88c11994341213a35c23f34168bba7a74bf3f89051f77beb39d823adce1a531"
+    "sha512=e4a35bdb7956b8d30a317923e86c750c174a7804b115b823bf67f66cf6dde5e40f687693a2fa9fee78e0a5a426ee0d1deeea22a723114905d57a41fd473e8b0e"
   ]
 }
-x-commit-hash: "79867ddb97f347657ff2ec026da1d77ec7864db6"
-x-maintenance-intent: [ "(latest)" ]
+x-commit-hash: "8e7f01715191305d4b10a4f85a918a679e7d5345"

[edwintorok]

will report to opatch.

[edwintorok]

hannesm/patch#43