On Mon, Nov 06, 2006 at 07:08:27PM -0500, Richard Lowe wrote: > Stephen Lau wrote: > >I'm done regenerating onnv-gate. I've had to rollback to: > >1416:48e679b0807a > > > >I've done a comparison against /ws/onnv-gate to make sure there are no > >other discrepencies, and everything looks good. > > > >I intend on pushing to the external Hg onnv-gate this evening - so if > >you want to get a head start, you can go ahead and move your repository > >out of the way and clone it up to 48e679b0807a and when I replace > >onnv-gate, you can just pull -u into that. > > > >If you have an opensolaris.org repo that is a child of onnv-gate and you > >want it fixed, please drop me a note and let me know. > >(Cyril: I'll take care of the ppc crew gate for you) > > > >I'm also open to suggestions if people think there is a better way of > >accomplishing this :) > > > > Local clone: > strip to that revision, then pull -u when the fixed onnv-gate is up. > > Local workspace with changes (Mq) > qpop -a, strip to that revision, pull -u when the fixed gate is up, > qpush -a. (add in the MqMerge stuff here if necessary...) > > Local workspace with changes, no Mq/opensolaris.org. > If you don't care about history, diff against the broken onnv-gate > (to avoid recreating the mod.c breakage...), switch to correct > onnv-gate by method of your choice, apply patch. > > If you do care about history, you maybe able to outgoing -p, or > export, save a copy of the logs (so you can match old delta->new > delta), then walk a workspace forward based on the new gate (clone > -r, pull -r), applying your changes and re-merging(?) as necessary. > > I can't think of better ways, but if there any I'd really like to hear > them... :)
This has been completed. The onnv-gate is now back up to date, and the bridge has been reactivated. Putbacks that happened in the past few days didn't get notifications sent out since I turned off the bridge during that time. Notifications should be reenabled now though. I've diffed all files under Hg control and they match up with the Teamware repository. Thanks for coping with the churn, and thanks for using the Mercurial repository :) Apologies for the screwiness, but hey... it's a beta - and it found a bug, so we're doing something right :) cheers, steve -- stephen lau // [EMAIL PROTECTED] | 650.786.0845 | http://whacked.net opensolaris // solaris kernel development _______________________________________________ opensolaris-code mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/opensolaris-code
