Date: Sat, 9 Aug 2008 15:49:30 -0400 From: John Baldwin <jhb@freebsd.org> To: Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?= <des@des.no> 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: <200808091549.30888.jhb@freebsd.org> In-Reply-To: <861w0zdsnn.fsf@ds4.des.no> References: <200808080430.m784U0VC086322@repoman.freebsd.org> <200808080905.26955.jhb@freebsd.org> <861w0zdsnn.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808091549.30888.jhb>