cvs commit: src/share/zoneinfo africa asia europe leapseconds
des at des.no
Fri Aug 8 22:54:38 UTC 2008
John Baldwin <jhb at 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.
Dag-Erling Smørgrav - des at des.no
More information about the cvs-all