[cl-mathstats-devel] Problem between Darcs 1.04 and Darcs 1.05
I'm currently using Darcs 1.04 (exact versions below). I have a repository that seems to work fine: > > d4 get http://common-lisp.net/project/cl-mathstats/darcs/cl- > mathstats > Copying patch 18 of 18... done! > Applying patch 18 of 18... done. > Finished getting. > > > d4 check > Applying patch 18 of 18... done. > The repo is consistent! > However, when I try to get the repository with 1.05 or check or repair the one I have, I get inconsistency errors: > > d5 get http://common-lisp.net/project/cl-mathstats/darcs/cl- > mathstats > Copying patch 18 of 18... done! > Applying patch 2 of 18... Unapplicable patch: > Fri Oct 7 15:09:22 EDT 2005 Gary King <gwking@metabang.com> > * meta.math and meta.statistics -> metabang.math and > metabang.statistics > > darcs failed: Error applying hunk to file ./dev/metabang.math.system > > d5 check > Applying patch 2 of 18... Unapplicable patch: > Fri Oct 7 15:09:22 EDT 2005 Gary King <gwking@metabang.com> > * meta.math and meta.statistics -> metabang.math and > metabang.statistics > > darcs failed: Error applying hunk to file ./dev/metabang.math.system > > > > d5 repair > Applying patch 2 of 18... Unapplicable patch: > Fri Oct 7 15:09:22 EDT 2005 Gary King <gwking@metabang.com> > * meta.math and meta.statistics -> metabang.math and > metabang.statistics > > darcs failed: Error applying hunk to file ./dev/metabang.math.system what, if anything, can I do to make my 1.04 repos into happy 1.05 ones?? thanks, Exact versions : D4: ([TAG 1.0.4pre4 David Roundy <droundy@darcs.net>**20050901110418] D5: [TAG 1.0.5Tommy Pettersson <ptp@lysator.liu.se>**20051207112730] -- Gary Warren King metabang.com http://www.metabang.com/
Just a guess: maybe this is related to <http://bugs.darcs.net/issue67>? -- Tommy Pettersson <ptp@lysator.liu.se>
I'm currently using Darcs 1.04 (exact versions below). I have a repository that seems to work fine:
However, when I try to get the repository with 1.05 or check or repair the one I have, I get inconsistency errors:
I'm afraid that your repository is corrupt. Did you manually edit files under _darcs/current? Did you use Unison on the repo? Darcs 1.04 has a bug where it fails to check patches exhaustively enough. This bug is fixed in 1.05.
what, if anything, can I do to make my 1.04 repos into happy 1.05 ones??
The simple solution would be to use 1.04 to generate all the historical versions of your project, and then manually record them one by one in a new repo. Another solution would be to simply discard history, and make a new repo starting at the current version. It's probably possible to edit the files under _darcs/patches to fix the repo manually, but it'd probably be a lot of work. Juliusz
Hi Juliusz, Thanks for this response. It's very helpful.
I'm afraid that your repository is corrupt. Did you manually edit files under _darcs/current? Did you use Unison on the repo?
I don't recall doing any manual editing but may have done something by "accident"
what, if anything, can I do to make my 1.04 repos into happy 1.05 ones??
The simple solution would be to use 1.04 to generate all the historical versions of your project, and then manually record them one by one in a new repo. Another solution would be to simply discard history, and make a new repo starting at the current version.
OK. In the case, I don't mind losing the history. If I did care, I'm not quite sure what you mean by "generating the historical versions..." Can you point me in the right direction? thanks again, -- Gary Warren King metabang.com http://www.metabang.com/
what, if anything, can I do to make my 1.04 repos into happy 1.05 ones??
The simple solution would be to use 1.04 to generate all the historical versions of your project, and then manually record them one by one in a new repo. Another solution would be to simply discard history, and make a new repo starting at the current version.
OK. In the case, I don't mind losing the history. If I did care, I'm not quite sure what you mean by "generating the historical versions..." Can you point me in the right direction?
Just manually create a new repo with the history you care about. For each version, use 1.0.4 to get a copy of that version, for example using darcs dist, then record this version in the new repo. You can use ``darcs record --pipe'' to force Darcs to use the original date and author for the new patch. The alternative is to manually edit the patches under _darcs/patches in order to fix the inconsistency. If you look at the darcs-users list archives, you'll find a happy user (Vincent Balat) who recently had just the same problem as you and successfully performed some major surgery on _darcs/patches, so it is definitely doable without full grokking of the Darcs sources. Juliusz
participants (3)
-
Gary King -
Juliusz Chroboczek -
Tommy Pettersson