Date: Thu, 27 Sep 2012 14:11:39 -0600 (MDT) From: Warren Block <wblock@wonkity.com> 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.1209271407020.90686@wonkity.com> 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
On Thu, 27 Sep 2012, 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? If you have made any local changes to files in /usr/src or /usr/ports, those changes will conflict with the versions svn will bring in. > 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? Yes, although svn will only care if those files differ from the files in the repository. Most people won't have any local changes anyway. > 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? Yes. If a new version of a file conflicts with your local changes, svn will complain and try to help resolve those conflicts.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1209271407020.90686>