From: Borut R. <bor...@gm...> - 2011-03-28 16:27:57
|
I saw it. But, interesting, regtests dies only on Mac OS X and Sparc Solaris machines. I'll take a look. Borut On 03/28/2011 04:30 PM, Maarten Brock wrote: > Borut, > > I think your last (code cleaning) commit broke the z80 code generator. > > Maarten > >> Am 19.02.2011 08:43, schrieb Borut Ražem: >>> If you have problems with svn merge, I can do it (actually >>> I'm already doing it from time to time). >>> >>> Borut >> So far svn merge worked fine. However there now is a problem with your >> recent code cleaning commits to trunk. These touched lots of lines all >> over sdcc, resulting in a huge number of conflicts when trying to merge >> trunk to the optralloc branch. Is there a better way than the very >> time-consuming one of resolving all of them manually? >> >> Philipp |