Date: Fri, 7 Oct 2016 16:12:08 -0700 From: Marcel Moolenaar <marcel@xcllnt.net> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org, src-committers@freebsd.org, Marcel Moolenaar <marcel@freebsd.org> Subject: Re: svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk Message-ID: <etPan.57f82bc8.1c4e7435.1066a@xcllnt.net> In-Reply-To: <9665440.L9f0uMEDrK@ralph.baldwin.cx> References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx> <etPan.57f802bb.59e4fadb.7f0b@xcllnt.net> <9665440.L9f0uMEDrK@ralph.baldwin.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On October 7, 2016 at 3:18:10 PM, John Baldwin (jhb@freebsd.org) wrote: On Friday, October 07, 2016 01:16:59 PM Marcel Moolenaar wrote: > On October 7, 2016 at 11:02:44 AM, John Baldwin (jhb@freebsd.org) wrote: > On Friday, October 07, 2016 03:42:21 PM Marcel Moolenaar wrote: > *snip* > > > Author: marcel > > Date: Fri Oct 7 15:42:20 2016 > > New Revision: 306811 > > URL: https://svnweb.freebsd.org/changeset/base/306811 > > > > Added: > > head/sys/sys/disk/ > > head/sys/sys/disk/apm.h > > - copied, changed from r306810, head/sys/sys/apm.h > > head/sys/sys/disk/bsd.h > > - copied, changed from r306810, head/sys/sys/disklabel.h > > head/sys/sys/disk/gpt.h > > - copied, changed from r306810, head/sys/sys/gpt.h > > head/sys/sys/disk/mbr.h > > - copied, changed from r306810, head/sys/sys/diskmbr.h > > head/sys/sys/disk/pc98.h > > - copied, changed from r306810, head/sys/sys/diskpc98.h > > head/sys/sys/disk/vtoc.h > > - copied, changed from r306810, head/sys/sys/vtoc.h > > Replaced: > > head/sys/sys/apm.h (contents, props changed) > > head/sys/sys/disklabel.h (contents, props changed) > > head/sys/sys/diskmbr.h (contents, props changed) > > head/sys/sys/diskpc98.h (contents, props changed) > > head/sys/sys/gpt.h (contents, props changed) > > head/sys/sys/vtoc.h (contents, props changed) > > Somehow this destroyed the history on these files. They showed up as > deleted and then added instead of modified. If you 'svn log' on them > now you only get this commit and none of the previous history. I've > no idea if there's a way to recover this? Had you originally done an > 'svn mv' in your checkout and then copied the files back over or some > such? > I did a move from sys/X.h to sys/disk/X.h. The history moved to sys/disk/X.h. New files were put where the old files used to be. > > Should I have done a svn copy? I think a copy would have been best. There is content in the sys/foo.h files still that has valid history (not all the lines were moved). Even if you had moved it all, I think a copy would still be best. I would only use a move if you are completely removing the original file. I'm not sure if there's a non-unfun way to recover from this. You might be able to copy the files from the previous revision, reapply your changes and then commit that. Ok. I’ll work on recovering the history of the original files. Maybe the repo masters can undo/delete the commit easily and I’ll just recommit. Avoids polluting the history… [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJX+CvIAAoJEIda8t8f0tjjNbwP/2wN1UX305qgpLRT/X6eMU1k +lujMuXmywY5ExFFt38o80vQQ43WKquI9rYfTsvuQW97hLgQetbyg9FMEGmd+Yjy qpXHdyMTeDgy5QYsMz7mFiDKdAvXTp0NDJ0eBSAnwMVTgmoXn6rhQlNjN7lfhsEa p/qvJFcxfc8Pnp9VcjuK6pimZTM1fTbzR3FYUF2CBSprJBfeoKy/sHKFm9pRydcS a0SfN2c8tOg9jYRxhT3YQ/+gc1dFtuPpG/AtGSDLhmfNc//tS6H4YNYHMyTEDskd 16DYeZln5D3LBekszsqwDf6pVYS+hsJFuX9JsTBex5UVay6EnAS0lw/QgCVAt8Iu D93Kq7umpmdhQQEQ8CNvgWpOnAlNqjE0zdvmqvV2hxt5SqBFP6NKpMoTRKWvQs3b xGO6FCGMrUegngcYJt2UbNSy/JJq3dbUcwi1SwHDI2y+NDTMz1JwKfBwSPfkjYdx o0msfAjBN++6opiuGIX0vQTWZiFqhnOjbtxqxL2B9kQf3+d6LsYla2GT8qMKgDo3 gpSpxKVvVApcXkhcRMjUldJ+bKRJJ+VTrtC3g99fDjuhG1Kcj2ho3IVvNN9zikZV VTLPWNeODy4SW9uKeDDUoFbrYionWaG77TVgz16vY64y2q/zr0Nbd2Fxq6dvFTLO nICuiKMGs+aussrXlN7T -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?etPan.57f82bc8.1c4e7435.1066a>