inadvertant patch reversal

Tupshin Harper <[email protected]> Wed, 14 Apr 2004 03:26:21 -0700

Newsgroups	gmane.comp.java.xwt.core,gmane.comp.version-control.darcs.user
Message-ID	<[email protected]>

Earlier in the evening, I applied the following:

[fixed class path for MIPSApps
[email protected]**20040414063932]  < > {
hunk ./Makefile 155
-               org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< 
-outfile $@
+               org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
}

Later, brian applied this:

[freetype fixes
[email protected]**20040414010853]  < > {
merger 0.0 (
hunk ./Makefile 152
-               org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< 
-outfile $@
+               org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
hunk ./Makefile 152
-               org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< 
-outfile $@
+               org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
)


Unfortunately, this appears to leave the repository without that fix. 
The Makefile in _current contains the following:

build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips 
.install_org.ibex.nestedvm
        @mkdir -p build/java/org/ibex/util
        @echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
        java -cp 
upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar 
\
                org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< 
-outfile $@


I'm not sure if this is a bug or a feature of darcs, but surely there 
must be a better way to handle this kind of situation.

-Tupshin