From owner-freebsd-stable@FreeBSD.ORG Fri May 29 21:52:46 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E4A81065672; Fri, 29 May 2009 21:52:46 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.freebsd.org (Postfix) with ESMTP id F1FE18FC1E; Fri, 29 May 2009 21:52:45 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0KKF00COCE3W7A70@osl1smout1.broadpark.no>; Fri, 29 May 2009 23:52:44 +0200 (CEST) Received: from kg-v2.kg4.no ([84.48.215.104]) by osl1sminn1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with SMTP id <0KKF00D09E3VWZ10@osl1sminn1.broadpark.no>; Fri, 29 May 2009 23:52:44 +0200 (CEST) Date: Fri, 29 May 2009 23:52:43 +0200 From: Torfinn Ingolfsen To: freebsd-stable@freebsd.org 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> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; amd64-portbld-freebsd7.2) X-Face: "t9w2,-X@O^I`jVW\sonI3.,36KBLZE*AL[y9lL[PyFD*r_S:dIL9c[8Y>V42R0"!"yb_zN,f#%.[PYYNq; m"_0v; ~rUM2Yy!zmkh)3&U|u!=T(zyv,MHJv"nDH>OJ`t(@mil461d_B'Uo|'nMwlKe0Mv=kvV?Nh@>Hb<3s_z2jYgZhPb@?Wi^x1a~Hplz1.zH Cc: Doug Barton Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 21:52:46 -0000 On Sat, 16 May 2009 16:13:12 -0700 Doug Barton 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