From owner-cvs-all@FreeBSD.ORG  Fri Aug  8 22:54:38 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A72171065678;
	Fri,  8 Aug 2008 22:54:38 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F8CD8FC08;
	Fri,  8 Aug 2008 22:54:38 +0000 (UTC) (envelope-from des@des.no)
Received: from ds4.des.no (des.no [84.49.246.2])
	by smtp.des.no (Postfix) with ESMTP id 450EC207E;
	Sat,  9 Aug 2008 00:54:37 +0200 (CEST)
Received: by ds4.des.no (Postfix, from userid 1001)
	id 1A9518448B; Sat,  9 Aug 2008 00:54:37 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: John Baldwin <jhb@freebsd.org>
References: <200808080430.m784U0VC086322@repoman.freebsd.org>
	<200808080905.26955.jhb@freebsd.org>
Date: Sat, 09 Aug 2008 00:54:36 +0200
In-Reply-To: <200808080905.26955.jhb@freebsd.org> (John Baldwin's message of
	"Fri, 8 Aug 2008 09:05:26 -0400")
Message-ID: <861w0zdsnn.fsf@ds4.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org,
	Edwin Groothuis <edwin@freebsd.org>
Subject: Re: cvs commit: src/share/zoneinfo africa asia europe leapseconds
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Aug 2008 22:54:38 -0000

John Baldwin <jhb@freebsd.org> writes:
> FYI, note that if you want, you can do multiple merges into the vendor
> area and then just do one merge of all the updates into src/.  You
> don't have to merge each version individually.  It's probably more
> work to do so, however.

Less work, actually, if you have local modifications, since you only
need to merge conflicts once.  OpenSSH would have been hell to merge if
I had done it one release at a time (I went straight from 4.5 to 5.1)

In this case, it made no difference, as the only local modifications we
had were manually applied upstream patches which were included in one of
the new releases Edwin merged.

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no