Date: Sat, 09 Aug 2008 00:54:36 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: John Baldwin <jhb@freebsd.org> 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 Message-ID: <861w0zdsnn.fsf@ds4.des.no> In-Reply-To: <200808080905.26955.jhb@freebsd.org> (John Baldwin's message of "Fri, 8 Aug 2008 09:05:26 -0400") References: <200808080430.m784U0VC086322@repoman.freebsd.org> <200808080905.26955.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?861w0zdsnn.fsf>