Date: Fri, 14 Aug 2015 15:58:36 +1000 From: Aristedes Maniatis <ari@ish.com.au> To: freebsd-stable <freebsd-stable@freebsd.org> Subject: merging commiter headers Message-ID: <55CD838C.4000109@ish.com.au>
next in thread | raw e-mail | index | archive | help
I've just upgraded three machines from 10.1 to 10.2. Congratulations on the release... This was one of the worst upgrade experiences in my FreeBSD history, going back to 4.0 days. I used freebsd-update but I was absolutely swamped with merging the svn (nee cvs) headers in roughly 80 files. <<<<<<< current version # $FreeBSD: release/10.0.0/etc/periodic/security/800.loginfail 254974 2013-08-27 21:20:28Z jlh $ ======= # $FreeBSD: releng/10.2/etc/periodic/security/800.loginfail 263661 2014-03-23 12:58:48Z brueffer $ >>>>>>> 10.2-RELEASE Let's leave aside why users would care what commit number, date or user last touched this file. Let's assume that you don't need a header to tell you the path of the file you are looking at. And let's leave aside why release is now releng (are we saving bytes?). And let's leave aside why the diff shows an upgrade from 10.0 to 10.2 when actually this was from 10.1 to 10.2. Can't some merge tool inside freebsd-update just sort this out for me? Please? Not only does it take over 45 minutes to go through all those files, but I feel sure I missed something. Ari -- --------------------------> Aristedes Maniatis ish http://www.ish.com.au Level 1, 30 Wilson Street Newtown 2042 Australia phone +61 2 9550 5001 fax +61 2 9550 4001 GPG fingerprint CBFB 84B4 738D 4E87 5E5C 5EFA EF6A 7D2E 3E49 102A
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55CD838C.4000109>