Date: Fri, 28 Sep 2012 11:19:19 -0600 (MDT) From: Warren Block <wblock@wonkity.com> To: Jamie Paul Griffin <jamie@kode5.net> 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.1209281115250.97730@wonkity.com> In-Reply-To: <20120928121106.GG2389@kontrol.kode5.net> 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> <alpine.BSF.2.00.1209271407020.90686@wonkity.com> <20120928121106.GG2389@kontrol.kode5.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 28 Sep 2012, Jamie Paul Griffin wrote: > [ Warren Block wrote on Thu 27.Sep'12 at 14:11:39 -0600 ] > > >> Yes. If a new version of a file conflicts with your local changes, svn >> will complain and try to help resolve those conflicts. > > When I changed to svn, I completely remove or moved (mv(1)) the > /usr/ports tree. Created a new /usr/ports and then used svn to pull in > the collection. The same for the base course tree in /usr/src. It's my > understanding you need to do that first. You can't use a mixed file > system tree comprising cvs/csup and svn files. I'm sure Some will > correct that if i'm wrong, but that's what I did and i've experienced > no problems with it. Right, but conflicts are what happen if you change files after the checkout. For example, I have a couple of custom patches to source. If new versions of the source are checked in to the FreeBSD svn repository, and they conflict with my local changes, svn will give a warning and help try to resolve them. > The only noticeable difference is when updating my ports collection > with svn, it's slower to update than say portsnap or cvs/csup. But > it's not a major issue for me. This seems to be highly variable, possibly depending on how often you update. For me, svn is at least as fast as cvs, and it feels faster. Might just be a lot of fast screen output. portsnap is easily the slowest on my systems. But I update very often.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1209281115250.97730>