On 7/10/2016 4:12 PM, Marcel Moolenaar wrote:
On October 7, 2016 at 3:18:10 PM, John Baldwin (j...@freebsd.org
<mailto:j...@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 (j...@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.
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
