Date: Fri, 7 Oct 2016 16:29:34 -0700 From: Marcel Moolenaar <marcel@xcllnt.net> To: Julian Elischer <julian@freebsd.org>, 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.57f82fdf.23ab0955.1066a@xcllnt.net> In-Reply-To: <f1ccb989-58bb-ccec-f6df-d2d4d18974a2@freebsd.org> References: <201610071542.u97FgLgU092008@repo.freebsd.org> <1910643.6VW4zuRaGg@ralph.baldwin.cx> <etPan.57f802bb.59e4fadb.7f0b@xcllnt.net> <9665440.L9f0uMEDrK@ralph.baldwin.cx> <etPan.57f82bc8.1c4e7435.1066a@xcllnt.net> <f1ccb989-58bb-ccec-f6df-d2d4d18974a2@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On October 7, 2016 at 4:18:31 PM, Julian Elischer (julian@freebsd.org) wrote: On 7/10/2016 4:12 PM, Marcel Moolenaar wrote: 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… I'll keep an eye out for my svn -> p4 mirror importer exploding in that area in the near future. this sort of thing makes it very ill, especially files going away and coming back. I just asked svnadm@ for advice. I’m sure they can suggest a way that doesn’t blow things up downstream consumers. I’m fine with the manual labor if that’s preferred... [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJX+C/fAAoJEIda8t8f0tjjvw4QAL1tKPArbq63GrgmH6QFJMtN TEx/qteAhTDOB9gDl4qeUQm8wx0mMuPTbzpYBKVF6c1HSb84V0kveKuo+QsuYqN1 bzkLjWPr7FSwA6gGva/eA9oP1WCgoW7iSyMSTCwfBFBG0gOaXOacEG719P/KQ1TG kZecI7skMOpTCYWFhUJM+5BJV86LYllbjDI91HxxmBSi+P7wJ/WWAmVFxExMq8U3 CHs2QQ3i0uGcGJSjJaBJfcJ1txNJ2hSHs3Gj6/rbBwsV+AYRcsa22j7C7iMKcZPG oTZewBwA6fW1hCBOqM8YHVgzi2B59rWfsBrOd2GlwF9/SyL55Q8HHdQe4Kja6dez 0zu2hPZaI4Qwo+DPRintary8tNf8k31KTfIW2skpgb1D05XNR3UzNsCpj87dX7sr nJd6kOio8Z7q16glzqQoQKEUgyQLZotb0TBxu7r5iF0EdJOqZbN09NXeXJDYkF6X RhFkrVRITarXBoPC9609BD+wXk4bvCw6yvbMOL/p9q5Pahn+h7Kkvl5rJfZBGpvi sGzGyDHTlSVgRiYykPU4JNQqoDmqk6zGkn6F4PlqvODOEjvFOE5AncAEg8pi+ODo GoCfv9rXLxW95UdiI3nOLA55vGTzpChrYQUSgUpXsSO9fv8cngQM9cvsePxRKcc2 xafjgx5gYOu8TQbKtnJU -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?etPan.57f82fdf.23ab0955.1066a>