On Friday 08 August 2008 06:54:36 pm Dag-Erling Smørgrav wrote: > John Baldwin <[EMAIL PROTECTED]> 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 have been more work, but I can see how what I wrote is ambiguous. -- John Baldwin _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "[EMAIL PROTECTED]"
