[pypy-dev] lltypesystem typecache

Michael Hudson micahel at gmail.com
Fri Jun 22 11:11:46 CEST 2007


On 22/06/07, Armin Rigo <arigo at tunes.org> wrote:
> Hi Scott,
>
> On Thu, Jun 21, 2007 at 03:11:15AM -0400, Scott Dial wrote:
> > (like today) I noticed it caused a update conflict due to Armin's
> > changes in r44398.
>
> My checkin was mostly accidental.  I think that the way the typecache is
> both a regular svn-controlled file deep within the hierarchy, and
> modified automatically, will keep causing conflicts in the future.

Indeed, since the rffi merge, we haven't had two builds in a row on tuatara :(

Cheers,
mwh



More information about the Pypy-dev mailing list