svn commit: r306811 - in head: etc/mtree include sys/sys sys/sys/disk

Marcel Moolenaar marcel at xcllnt.net
Fri Oct 7 20:17:12 UTC 2016


On October 7, 2016 at 11:02:44 AM, John Baldwin (jhb at 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?


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Message signed with OpenPGP using AMPGpg
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20161007/e22d328c/attachment.sig>


More information about the svn-src-all mailing list