painful binary upgrade from 8.1 to 8.2

[Randal L. Schwartz]

>>>>> "Mark" == Mark Felder <feld at feld.me> writes:

Mark> Does freebsd-update follow /etc/mergemaster.rc?

No, apparently it just calls classic "merge", which doesn't have any
kind of "ignore CVS tags".  No wonder it's painful.

But surely, I'm not the only one using freebsd-update.  Does everyone
else put up with this, or is there some additional tool I'm missing?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn at stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.posterous.com/ for Smalltalk discussion