From owner-cvs-src@FreeBSD.ORG  Sat Aug  9 21:02:18 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0370106567F;
	Sat,  9 Aug 2008 21:02:18 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6804C8FC23;
	Sat,  9 Aug 2008 21:02:18 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from zion.baldwin.cx (zion.baldwin.cx
	[IPv6:2001:470:1f11:75:2a0:d2ff:fe18:8b38]) (authenticated bits=0)
	by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m79L1w7L043547;
	Sat, 9 Aug 2008 17:02:05 -0400 (EDT) (envelope-from jhb@freebsd.org)
From: John Baldwin <jhb@freebsd.org>
To: Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?= <des@des.no>
Date: Sat, 9 Aug 2008 15:49:30 -0400
User-Agent: KMail/1.9.7
References: <200808080430.m784U0VC086322@repoman.freebsd.org>
	<200808080905.26955.jhb@freebsd.org> <861w0zdsnn.fsf@ds4.des.no>
In-Reply-To: <861w0zdsnn.fsf@ds4.des.no>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Message-Id: <200808091549.30888.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-2.0.2 (server.baldwin.cx
	[IPv6:2001:470:1f11:75::1]); Sat, 09 Aug 2008 17:02:05 -0400 (EDT)
X-Virus-Scanned: ClamAV 0.93.1/7995/Sat Aug 9 14:55:20 2008 on
	server.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,NO_RELAYS 
	autolearn=ham version=3.1.3
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx
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-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2008 21:02:18 -0000

On Friday 08 August 2008 06:54:36 pm Dag-Erling Sm=C3=B8rgrav wrote:
> 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)

Heh, I was trying to say that merging each individual release to src/ would=
=20
have been more work, but I can see how what I wrote is ambiguous.

=2D-=20
John Baldwin