Date: Fri, 29 May 2009 23:52:43 +0200 From: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no> To: freebsd-stable@freebsd.org Cc: Doug Barton <dougb@freebsd.org> Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <20090529235243.9468e09b.torfinn.ingolfsen@broadpark.no> In-Reply-To: <4A0F4888.3070709@FreeBSD.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> <4A0F4888.3070709@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 16 May 2009 16:13:12 -0700 Doug Barton <dougb@freebsd.org> wrote: > You should be able to grab the file from HEAD and run it on > RELENG_[67] without any problems. I will MFC it as rapidly as > possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For the mergemaster steps in the "make world" procedure, I used /usr/src/usr/sbin/mergemaster/mergemaster.sh instead of just mergemaster. Worked like a charm. Thanks! -- Regards, Torfinn Ingolfsen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090529235243.9468e09b.torfinn.ingolfsen>