Date: Fri, 7 Oct 2016 17:13:01 -0700 From: Julian Elischer <julian@freebsd.org> To: Marcel Moolenaar <marcel@xcllnt.net>, 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: <acd1c614-7a92-f14e-77f1-d218beb0530d@freebsd.org> In-Reply-To: <etPan.57f82fdf.23ab0955.1066a@xcllnt.net> 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> <etPan.57f82fdf.23ab0955.1066a@xcllnt.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 7/10/2016 4:29 PM, Marcel Moolenaar wrote: > On October 7, 2016 at 4:18:31 PM, Julian Elischer > (julian@freebsd.org <mailto: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 >>> <mailto: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... > > I run a svn-> P4 imoprter that is importign at 1:1.. so change 300000 in SVN is 300000 in p4. If we end up making extra or missing revisions, I'll lose that 1:1 feature ..e.g. if 350000 in svn maps to 350001 or 349999 in p4 that's a lot less useful to me..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?acd1c614-7a92-f14e-77f1-d218beb0530d>