I obliterated all patches not related to the merger patch causing the
problem, and uploaded a hased version of the repo at :
http://progg.free.fr/darcs/smaller-ddc-head
Now, during "darcs convert", the Zlib problem does no longer happen, but
instead I have another problem, right after the lossy conversion:
======================
Directory '/home/guillaume/repos/smaller-ddc-head' already exists,
creating repository as '/home/guillaume/repos/smaller-ddc-head_4'
lossy conversion of complicated conflict:
merger 0.0 (
hunk ./test/Graphics/N-Body/Boxed/Main.build 6
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
hunk ./test/Graphics/N-Body/Boxed/Main.build 6
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
)
lossy conversion of complicated conflict:
merger 0.0 (
hunk ./test/Graphics/N-Body/Unboxed/Main.build 6
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
hunk ./test/Graphics/N-Body/Unboxed/Main.build 6
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
)
lossy conversion of complicated conflict:
merger 0.0 (
hunk ./test/Graphics/Simple/Main.build 6
+
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
hunk ./test/Graphics/Simple/Main.build 6
+
+extra-link-lib-dirs:
+ /usr/X11R6/lib
)
darcs failed: Couldn't fetch
`3d8f84722cab37e13c253037d35e7bc2f0de4a73d71826147c09712562192358'
in subdir pristine.hashed from sources:
thisrepo:/home/guillaume/repos/smaller-ddc-head_4
cache:/home/guillaume/.darcs/cache
An error may have left your new working directory an inconsistent
but recoverable state. You should be able to make the new
repository consistent again by running darcs revert -a.
======================
This happened with a cold cache.
This does not happen with darcs2.3.1 and darcs 2.4.3.
Doing darcs revert -a in the new repo does not change anything, and
darcs HEAD check does not say anything wrong, but darcs2.3.1 check says:
===============
$ darcs2.3.1 check
Looks like we have a difference...
darcs failed: Couldn't fetch
`3d8f84722cab37e13c253037d35e7bc2f0de4a73d71826147c09712562192358'
in subdir pristine.hashed from sources:
thisrepo:/home/guillaume/repos/smaller-ddc-head_4
cache:/home/guillaume/.darcs/cache
========================
But darcs2.4.3 says the repository is fine! I'll test with darcs2.4.4.
|