Re: painful binary upgrade from 8.1 to 8.2
On 06/11/2011 19:25, Randal L. Schwartz wrote: When following the instructions at http://www.freebsd.org/releases/8.2R/announce.html to go from 8.1 to 8.2, I'm presented during the command: freebsd-update upgrade -r 8.2-RELEASE with no less than *** 322 *** files that differ only by the CVS tag. The tag presumably being $FreeBSD$? Is it specifically a CVS tag? As opposed to a SVN tag?[*] If the former, then ever since the primary src repo switched to SVN, all of the files under /etc will get a version number bump as a consequence of generating a new release even if the contents didn't change. Before SVN that didn't happen. If the files are taken directly from SVN, then I think the revision number in any file should remain the same in all release branches unless the file contents are changed. Perhaps generating freebsd-update changesets directly out of SVN rather than via CVS would go a long way to avoiding this problem. Cheers, Matthew [*] The pertinent difference being that CVS has version numbers with one or more decimal points in them, whilst SVN uses an integer value. -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matt...@infracaninophile.co.uk Kent, CT11 9PW signature.asc Description: OpenPGP digital signature
painful binary upgrade from 8.1 to 8.2
When following the instructions at http://www.freebsd.org/releases/8.2R/announce.html to go from 8.1 to 8.2, I'm presented during the command: freebsd-update upgrade -r 8.2-RELEASE with no less than *** 322 *** files that differ only by the CVS tag. After hitting about 150 of these with ret ret ret dd dd dd ret dd : wq ret, I'm really frustrated, because I made a mistake and now apparently have to start over. Why doesn't the freebsd-update command invoke mergemaster with -F? Or is there some step that I'm leaving out? -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 mer...@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 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: painful binary upgrade from 8.1 to 8.2
On Sun, 06 Nov 2011 13:25:30 -0600, Randal L. Schwartz mer...@stonehenge.com wrote: Why doesn't the freebsd-update command invoke mergemaster with -F? Or is there some step that I'm leaving out? Does freebsd-update follow /etc/mergemaster.rc? # Automatically install files that do not exist AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace #DIFF_FLAG='.Bub' # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' This is precisely why I still do source upgrades most of the time. But I haven't tried since I started using mergemaster.rc. Regards, Mark ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: painful binary upgrade from 8.1 to 8.2
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? -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 mer...@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 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: painful binary upgrade from 8.1 to 8.2
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
