How to use subversion to keep source, system and doc files up
to date?
Trond Endrestøl
Trond.Endrestol at fagskolen.gjovik.no
Thu Sep 27 16:24:11 UTC 2012
On Thu, 27 Sep 2012 08:18-0700, Ed Flecko wrote:
> Thank you all!
>
> I'm a little confused by Trond's reply,
>
> "Make sure your /usr/src and /usr/ports directories does not contain
> files and directories served by Subversion, they will hinder
> extraction/updating when checking out a Subversion working copy on top
> of the existing hierarchy.
>
> Simply delete all non-local files, rename /usr/src/sys to, say
> /usr/src/sys0, do the Subversion check out, and move your local files
> back into place."
>
> 1.) What is meant by deleting all non-local files? What files is he
> referring to?
First, I may have misread your question. Others have provided far
better answers to your exact question.
I use my local CVS repo to track changes I make to files I create or
edit myself, like /etc/rc.conf,
/usr/src/sys/amd64/conf/SOMECUSTOMKERNEL, etc.
When I switched from CVSup to Subversion, I let the directory
/usr/src/sys exist, but only with my own files stored within this
hierarchy, e.g. my custom kernel configuration file,
/usr/src/sys/amd64/conf/ENTERPRISE.
The very existence of the directory /usr/src/sys prohibited Subversion
from populating the directory /usr/src/sys with the desired contents.
Thus, I had to delete all files and directories made during the intial
svn co operation, including the special .svn directory, rename sys to
sys0 as described in my previous email, redo the svn co operation, and
finally move my own (custom) files back into place.
Afterwards, it's simply a matter of running svn update to update
source files from the chosen svn repo, and in my case, check in any
local changes made to the local CVS repo I use for my configuration
management.
Maybe me adding CVS to the mix caused or still cause confusion.
> 2.) If I rename /usr/src/sys to, say /usr/src/sys0, do the Subversion
> check out, and move your local files back into place, won't that be
> replacing new files with the older files?
I was indirectly referring to local edited files, such as custom
kernel configuration files. My bad for not making this clearer.
> 3.) These steps are just meant for the initial check out, aren't
> they??? Once I've checked out (i.e., "downloaded", right?) the current
> files, I'll only need to: svn update /usr/ports..., etc. from that
> point forward and not "delete all non-local files, rename /usr/src/sys
> to, say /usr/src/sys0, do the Subversion check out, and move your
> local files back into place"...Is that right?
True. I had to do the rename and move files dance only once.
--
+-------------------------------+------------------------------------+
| Vennlig hilsen, | Best regards, |
| Trond Endrestøl, | Trond Endrestøl, |
| IT-ansvarlig, | System administrator, |
| Fagskolen Innlandet, | Gjøvik Technical College, Norway, |
| tlf. mob. 952 62 567, | Cellular...: +47 952 62 567, |
| sentralbord 61 14 54 00. | Switchboard: +47 61 14 54 00. |
+-------------------------------+------------------------------------+
More information about the freebsd-questions
mailing list