Martin Bochnig wrote: > Hi Moinak, > > compromise: I would prefer that we merge our most recent changes by hand, > line by line, rather than having mercurial (or whatever system) doing it > automatically (messing up the pkgdefs etc., as explained earlier). > > Could you send me your most recent diffs please? > We can continue in non-public / bilateral email communication, if you like. > My x64 compile box is waiting. > I may have two hours time every 2nd day, something like that ... >
Fine with me. Whatever is convenient for you since you of course have done a huge amount of work and have massive diffs. I will send my diffs to you offline. Some of the diffs should be the same as before. Regards, Moinak. > Cheers, > Martin > -- > > This message posted from opensolaris.org > > _______________________________________________ > indiana-discuss mailing list > [email protected] > http://mail.opensolaris.org/mailman/listinfo/indiana-discuss > _______________________________________________ indiana-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/indiana-discuss
