Date: Thu, 27 Sep 2012 18:24:04 +0200 (CEST) From: =?ISO-8859-1?Q?Trond_Endrest=F8l?= <Trond.Endrestol@fagskolen.gjovik.no> To: Ed Flecko <edflecko@gmail.com> Cc: freebsd-questions@freebsd.org Subject: Re: How to use subversion to keep source, system and doc files up to date? Message-ID: <alpine.BSF.2.00.1209271808190.60743@mail.fig.ol.no> In-Reply-To: <CAFS4T6YLZ%2Bq5HW3dE%2BwKe2pH0aUgKFwtoA=_-j%2Bm8_f1802TtQ@mail.gmail.com> References: <CAFS4T6ZziRkEHdcsnARMPjwSwAS5xRfpHzRUnyEpVkfQwf157A@mail.gmail.com> <20120927001135.8e893552.freebsd@edvax.de> <CAFS4T6bg9ZOoFG%2B_h9dMQ_9cWvA3wueay6AvEY86=6GSN-524Q@mail.gmail.com> <CA%2B8gk996vcx4saH_ehMSEr79N2aPw22b%2BRH%2BQfVsw%2B8wg4ACZQ@mail.gmail.com> <alpine.BSF.2.00.1209270552430.82694@abbf.ynefrvtuareubzr.pbz> <CAFS4T6YLZ%2Bq5HW3dE%2BwKe2pH0aUgKFwtoA=_-j%2Bm8_f1802TtQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --2055831798-408008236-1348763044=:60743 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT 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. | +-------------------------------+------------------------------------+ --2055831798-408008236-1348763044=:60743--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1209271808190.60743>