Re: inadvertant patch reversal

Brian Alliet <[email protected]> Wed, 14 Apr 2004 09:03:31 -0400
Newsgroups gmane.comp.java.xwt.core
Message-ID <[email protected]>
On Apr 14, 2004, at 6:26 AM, Tupshin Harper wrote:

> Earlier in the evening, I applied the following:
>
> [fixed class path for MIPSApps
[snip]
> Later, brian applied this:

Later? I committed that before you even got yours ok'ed. Don't try to 
blame this one on me :) Regardless, I don't think darcs should've let 
this happen.

> [freetype fixes
> [email protected]**20040414010853]  < > {

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

This looks similar to a problem I had before. Somehow there was a 
conflict and _darcs/current got out of sync with the root dir. Adam 
fixed it somehow. I'm not sure how.

-Brian