Re: How to use subversion to keep source, system and doc files up to date?

2012-09-28 Thread Warren Block
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))

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-28 Thread Jamie Paul Griffin
[ 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/port

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Warren Block
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

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Trond Endrestøl
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 Subversi

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Ed Flecko
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

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Lars Eighner
If only subversion had some scripts similar to the *-supfile s with cvsup, including some "first time scripts." -- Lars Eighner http://www.larseighner.com/index.html 8800 N IH35 APT 1191 AUSTIN TX 78753-5266 ___ freebsd-questions@freebsd.org mailing l

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Alexandre
On Thu, Sep 27, 2012 at 12:44 AM, Ed Flecko wrote: > > Thank you. > > I am using a custom kernel, but you're right - I should have said so. > > :-) > > Do you have any feedback using subversion? I know I can still use > csup; I'm basically trying to figure out how to subversion to achieve > the sa

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-27 Thread Matthew Seaman
On 27/09/2012 07:41, Polytropon wrote: > Does anyone know if there are already plans to make svn part > of the base system and integrate it with make, so that one > can use "make update" (in /usr/src and/or /usr/ports) with > control files or options (e. g. in /etc/make.conf) to have > influence on

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Polytropon
On Thu, 27 Sep 2012 02:34:47 -0400, Thomas Mueller wrote: > > from "David J. Weller-Fahy" : > > > svn update /usr/src/ > > When you use svn the first time, svn doesn't know where the repository is, > and svn repository is not fully in sync with cvs or csup repository. > > So you might need, in

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Thomas Mueller
from "David J. Weller-Fahy" : > svn update /usr/src/ When you use svn the first time, svn doesn't know where the repository is, and svn repository is not fully in sync with cvs or csup repository. So you might need, in a fresh directory, svn co svn://svn.freebsd.org/base/stable/9 /usr/src Th

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Trond Endrestøl
On Wed, 26 Sep 2012 14:12-0700, Ed Flecko wrote: > I see that CVS is being phased out in favor of subversion. > > I follow the documentation to keep my system up to date by doing: > > # cd /usr/src > # make buildworld > # make buildkernel > # make installkernel > # shutdown -r now > > and then.

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread David J. Weller-Fahy
While I track CURRENT, not STABLE, the process should not be significantly different. Here is what I do. * Ed Flecko [2012-09-26 17:18 -0400]: > I follow the documentation to keep my system up to date by doing: Here I update the src tree. # svn update /usr/src/ > # cd /usr/src > # make buildw

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Ed Flecko
Thank you. I am using a custom kernel, but you're right - I should have said so. :-) Do you have any feedback using subversion? I know I can still use csup; I'm basically trying to figure out how to subversion to achieve the same result. Ed ___ freebs

Re: How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Polytropon
On Wed, 26 Sep 2012 14:12:34 -0700, Ed Flecko wrote: > I see that CVS is being phased out in favor of subversion. > > I follow the documentation to keep my system up to date by doing: > > # cd /usr/src > # make buildworld > # make buildkernel > # make installkernel > # shutdown -r now > > and th

How to use subversion to keep source, system and doc files up to date?

2012-09-26 Thread Ed Flecko
I see that CVS is being phased out in favor of subversion. I follow the documentation to keep my system up to date by doing: # cd /usr/src # make buildworld # make buildkernel # make installkernel # shutdown -r now and then... # mount -u / # mount -a -t ufs # adjkerntz -i # mergemaster -p # cd