Hi Martin, I was going through the diffs you sent to indiana-discuss. They are quite huge and should be merged in one module at a time. I was seeing diffs like the following:
Binary files ./fox-gate__AlanMercurDefault20070901sat1153hCEST/./.hg/store/00changelog.i and ./XXX__fox-gate__Alan20070901__Moinak20070501__Martin20071012__x64_x86_sparc/./.hg/store/00changelog.i differ This seems kinda weird. You probably need to sync up you hg workspace. Also I noticed that you are using the older diffs for the open-src/apps directory. I have spent some time updating those to the latest versions. So in fact it will make you job easier if I commit my changes to open-src/apps first. You just need to execute hg pull and hg update and mercurial should merge in the apps changes nicely. Regards, Moinak. Martin Bochnig wrote: > I some new-to-this-list-reader wants to build it: > Don't apply the patch, but please take the full tarball: > http://www.martux.org/xorg/FOX1.0/src/FOXpre1.0_Alan20070901__Moinak20070501__Martin20070930__x64_x86_sparc_merge_XXX.tar.bz2 > > rgds > %martin > > > This message posted from opensolaris.org > _______________________________________________ > xwin-discuss mailing list > xwin-discuss at opensolaris.org >
