From owner-freebsd-stable@FreeBSD.ORG  Mon Dec  5 08:59:24 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 57E0716A41F
	for <freebsd-stable@freebsd.org>; Mon,  5 Dec 2005 08:59:24 +0000 (GMT)
	(envelope-from martinkov@pobox.sk)
Received: from mail.pipni.cz (mail.pipni.cz [193.86.238.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4BA4343D60
	for <freebsd-stable@freebsd.org>; Mon,  5 Dec 2005 08:59:19 +0000 (GMT)
	(envelope-from martinkov@pobox.sk)
Received: from [193.86.238.3] (port=44222 helo=gamato.org)
	id 1EjCBn-0006Uv-GL; Mon, 05 Dec 2005 09:59:15 +0100
From: "martinko" <martinkov@pobox.sk>
To: delphij@delphij.net
Date: Mon, 5 Dec 2005 09:59:14 +0100
Message-Id: <20051205085825.M13618@pobox.sk>
In-Reply-To: <a78074950512041837o34d90778y8ca693b6a69eea0@mail.gmail.com>
References: <dmvf9t$e0i$1@sea.gmane.org>
	<a78074950512041837o34d90778y8ca693b6a69eea0@mail.gmail.com>
X-Mailer: Open WebMail 2.51 20050228
X-OriginatingIP: 165.72.200.9 (m@gamato.org)
MIME-Version: 1.0
Content-Type: text/plain;
	charset=iso-8859-2
Cc: freebsd-stable@freebsd.org
Subject: Re: a file version number going down after upgrade from 6.0-R to
	6.0-S
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Dec 2005 08:59:24 -0000

On Mon, 5 Dec 2005 10:37:05 +0800, Xin LI wrote
> Hi,
> 
> On 12/5/05, martinko <martinkov@pobox.sk> wrote:
> > hello,
> >
> > i noticed, when upgrading from 6.0-R to 6-stable, that
> > /etc/rc.d/wpa_supplicant version went down.
> > until now i had believed that stable branch contains newer software than
> > the release. if so, why this "downgrade" ??
> 
> 1.1.4.1 stands for "first revision of the 4th branch" on 1.1, and
> 1.1.2.1 stands for "first revision of the 2nd branch".  The former is
> created after the latter.  It's not a downgrade as RELENG_6_0 is
> created after RELENG_6 (hence 4 vs 2), and everything merged to
> RELENG_6_0 must be part of RELENG_6 before it happen.
> 
> Cheers,
> --
> Xin LI <delphij@delphij.net> http://www.delphij.net


I see now. Many thanks for your explanation, Xin!

Martin