[darcs-users] even worse
David Roundy
droundy at abridgegame.org
Tue May 18 10:08:24 UTC 2004
On Sun, May 09, 2004 at 08:54:40PM -0700, Adam Megacz wrote:
>
> $ darcs get http://www.megacz.com/tmp/fux0red
> Unapplicable patch:
> Fri Apr 16 16:54:06 PDT 2004 brian at brianweb.net
> * org.xwt.mips -> org.ibex.nestedvm
>
> darcs failed: Unapplicable patch!
The problem was corruption caused by an old bug in darcs, which caused it
to not check when you removed a directory, whether that directory was
empty. The two relevant patches are:
Fri Apr 16 19:56:32 EDT 2004 brian at brianweb.net
* kill xwt dir
Fri Apr 16 19:54:06 EDT 2004 brian at brianweb.net
* org.xwt.mips -> org.ibex.nestedvm
In the first patch (org.xwt.mips -> org.ibex.nestedvm), there are
rmdir ./src/org/xwt/mips
rmdir ./src/org/xwt
but ./src/org/xwt/mips/util still exists, and the second patch consists of
simply
rmdir ./src/org/xwt/mips/util
rmdir ./src/org/xwt/mips
rmdir ./src/org/xwt
This is an annoying bit of corruption, and the best thing I can think of is
to edit the two files (you probably will need to ungzip them and then
rename them to have the original .gz name, i.e.
gunzip \
_darcs/patches/20040416235406-24bed-c557be79adad6541a282cc40506e263afdf7d2c6.gz
mv \
_darcs/patches/20040416235406-24bed-c557be79adad6541a282cc40506e263afdf7d2c6 \
_darcs/patches/20040416235406-24bed-c557be79adad6541a282cc40506e263afdf7d2c6.gz
gunzip \
_darcs/patches/20040416235632-24bed-51269417d3373d57aa75f15cd5f6942df487dd39.gz
mv \
_darcs/patches/20040416235632-24bed-51269417d3373d57aa75f15cd5f6942df487dd39 \
_darcs/patches/20040416235632-24bed-51269417d3373d57aa75f15cd5f6942df487dd39.gz
You'll want to add the "rmdir ./src/org/xwt/mips/util" line to
"org.xwt.mips -> org.ibex.nestedvm", and remove all three lines from "kill
xwt dir". This repository will still be consistent with any other copies
of it you might have, but you should phase other copies out (or do the same
surgery), since they'll still have the corrupt version of these patches.
:( That was not a pleasant bug.
--
David Roundy
http://www.abridgegame.org
More information about the darcs-users
mailing list