On Sun, Nov 06, 2011 at 11:54:27AM -0800, Randal L. Schwartz wrote: > > >>>>> "Mark" == Mark Felder <f...@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? >
I had the exact same problem when going from 7.3 to 7.4 The result: I don't use freebsd-update any longer and update the traditional way from source. AFAIK, I followed the instructions to the letter. I would be interested to see if there is a workaround, otherwise it seems that freebsd-update is the long way of updating; assuming you've got the "ignore CVS tags" flag enabled in mergemaster.rc Regards, -- Frank Contact info: http://www.shute.org.uk/misc/contact.html
pgpXpCJhNGo0U.pgp
Description: PGP signature
