Date: Thu, 27 Mar 1997 17:03:02 +1100 From: Bruce Evans <bde@zeta.org.au> To: jkh@time.cdrom.com, obrien@NUXI.com Cc: cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org, obrien@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/cpio - Imported sources Message-ID: <199703270603.RAA12494@godzilla.zeta.org.au>
next in thread | raw e-mail | index | archive | help
>> Foo. This would also have been an excellent time to move cpio >> to contrib. :-( > >It is my intention to do this with the update to v2.4.2, and was thinking >of doing this with this commit... but frankly I was afraid of really >screwing things up. I've never done a move like this before in CVS. How >to keep the history? It's hard to do without screwing up the history and losing patches, but there is no point to just moving things - you have to separate out the FreeBSD Makefiles and local files and keep the old directory hierarchy to build in. See gdb and texinfo for how not to do things (history is in attics ...). gdb was complicated becase we have significant local changes and we switched to using the distribution files in a few cases (and these files had some but not all of our changes). texinfo was simple except for the directory layout changing, but some patches and all history were lost. cpio is as simple as texinfo. It mainly has whitespace changes which should be lost :-). >I want to import v2_4_2 today (or tomarrow), but need a little help with >the steps to doing the merge w/o really messing up the repository. Wait for it to be moved. Bruce
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703270603.RAA12494>