Re: questions on development(7)

2007-12-18 Thread Jeremie Le Hen
Hi, Sorry for the late reply. On Fri, Nov 09, 2007 at 04:56:24AM +, Aryeh M. Friedman wrote: > 4. Mergemaster behaves strange now: everytime I run it does a > buildworld before doing the merge (even if I just did a > installworld)... also it seems to default this to /usr/src2 (which is > mo

Re: questions on development(7)

2007-11-14 Thread Adrian Chadd
On 15/11/2007, Simon 'corecode' Schubert <[EMAIL PROTECTED]> wrote: > This is due to the fact that CVS doesn't have changesets. It is too > late now and it is also quite complicated to explain, but it boils down > to the fact that aggregating changesets will remove information, namely > the singl

Re: questions on development(7)

2007-11-14 Thread Simon 'corecode' Schubert
Giorgos Keramidas wrote: >>> I'm only tracking 'HEAD' most of the time, but there are some efforts >>> underway to convert the history of src/. One notable example is the >>> effort to convert to Subversion first, and then use the tags/branches >>> and changesets of Subversion to populate an Hg tr

Re: questions on development(7)

2007-11-14 Thread Giorgos Keramidas
On 2007-11-14 19:08, Simon 'corecode' Schubert <[EMAIL PROTECTED]> wrote: > [cc cleaned, dropped -current] > >Giorgos Keramidas wrote: >> I'm only tracking 'HEAD' most of the time, but there are some efforts >> underway to convert the history of src/. One notable example is the >> effort to conver

Re: questions on development(7)

2007-11-14 Thread Simon 'corecode' Schubert
OutbackDingo wrote: >> I suppose you know about fromcvs. I also guess you know that I suggest >> using git instead of hg. Doesn't produce nasty large index files either :) > So would you think cvs -> git -> hg might be easier to accomplish ?? > Since one of my goals is to update projects Ive done

Re: questions on development(7)

2007-11-14 Thread OutbackDingo
> I suppose you know about fromcvs. I also guess you know that I suggest > using git instead of hg. Doesn't produce nasty large index files either :) > > cheers > simon So would you think cvs -> git -> hg might be easier to accomplish ?? Since one of my goals is to update projects Ive done b

Re: questions on development(7)

2007-11-14 Thread Simon 'corecode' Schubert
[cc cleaned, dropped -current] Giorgos Keramidas wrote: > I'm only tracking 'HEAD' most of the time, but there are some efforts > underway to convert the history of src/. One notable example is the > effort to convert to Subversion first, and then use the tags/branches > and changesets of Subvers

Re: questions on development(7)

2007-11-14 Thread Giorgos Keramidas
On 2007-11-14 15:31, OutbackDingo <[EMAIL PROTECTED]> wrote: > All ive seen in FreeBSD hg branches is a current and a releng_6 Id > like to see a complete tree converted if there is one out there. I do > have some bandwidth to potentially host such a conversion for others. > question is does one ex

Re: questions on development(7)

2007-11-14 Thread Giorgos Keramidas
On 2007-11-14 17:48, Daniel O'Connor <[EMAIL PROTECTED]> wrote: >> I've been using a 'converted' tree for almost a year and a half now, >> to keep a local mirror of the src repository at `/ws/freebsd/head' on >> my laptop. The first clean import of the current tree I am using was >> done during la

Re: questions on development(7)

2007-11-13 Thread OutbackDingo
All ive seen in FreeBSD hg branches is a current and a releng_6 Id like to see a complete tree converted if there is one out there. I do have some bandwidth to potentially host such a conversion for others. question is does one exist ? On Wed, 2007-11-14 at 17:48 +1030, Daniel O'Connor wrote: > On

Re: questions on development(7)

2007-11-13 Thread Daniel O'Connor
On Wed, 14 Nov 2007, Giorgos Keramidas wrote: > * Periodic 'imports' of the FreeBSD src/ tree as 'vendor' code > > * Incremental conversion of /home/ncvs/src in 'changesets' > > I've been using a 'converted' tree for almost a year and a half now, > to keep a local mirror of the src repository a

Re: questions on development(7)

2007-11-13 Thread Mike Meyer
On Tue, 13 Nov 2007 21:45:30 +0200 Giorgos Keramidas <[EMAIL PROTECTED]> wrote: > > I wonder if ther is a way we could broadcast changes to the p4 'head' > > branch so that people could keep their own p4 servers up to date. > > Unfortunately, no. Perforce is not easy to 'mirror' around the world,

Re: questions on development(7)

2007-11-13 Thread Giorgos Keramidas
On 2007-11-09 11:23, Julian Elischer <[EMAIL PROTECTED]> wrote: > ok having done this for years here's how it goes. If you have a > private CVS repo mirroring the FreeBSD tree then you can keep your > changes up to date in your "checked out" source tree. but you can > generally not check them in a

Re: questions on development(7)

2007-11-09 Thread Julian Elischer
OutbackDingo wrote: On Fri, 2007-11-09 at 14:43 +, Tom Evans wrote: On Fri, 2007-11-09 at 21:49 +0800, OutbackDingo wrote: well thats kinda hard to do with CVS, though other revision systems such as mercurial, bazaar, git and perforce, even subversion do it well, there is also a mercurial r

Re: questions on development(7)

2007-11-09 Thread Stefan Sperling
> > You won't be able to commit to the BSD repo from your server. Well, Aryeh wants to commit to a _local_ copy of the BSD repo. This works. See development(7). One thing the man page does not mention is that you need to change the commit hook in CVSROOT (which you only copy on first sync and nev

Re: questions on development(7)

2007-11-09 Thread Beech Rintoul
On Thursday 08 November 2007, Aryeh M. Friedman said: > First of all I am posting to both -current and -hackers because > -hackers seems to be very low volume. Please do not cross post. It is considered bad form and generates thousands of unnecessary emails. Beech -- -

Re: questions on development(7)

2007-11-09 Thread Giorgos Keramidas
On 2007-11-09 21:49, OutbackDingo <[EMAIL PROTECTED]> wrote: > well thats kinda hard to do with CVS, though other revision systems such > as mercurial, bazaar, git and perforce, even subversion do it well, > there is also a mercurial respository for FreeBSD out there some where That is cool, but i

Re: questions on development(7)

2007-11-09 Thread James
On Fri, 2007-11-09 at 05:47 +, Aryeh M. Friedman wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > > > > > > > If you keep a local repo, and checkout from the local repo, then > > your checkout will merge the changes (unless there are conflicts). > > Thanks the fact I know the an

Re: questions on development(7)

2007-11-09 Thread OutbackDingo
On Fri, 2007-11-09 at 14:43 +, Tom Evans wrote: > On Fri, 2007-11-09 at 21:49 +0800, OutbackDingo wrote: > > well thats kinda hard to do with CVS, though other revision systems such > > as mercurial, bazaar, git and perforce, even subversion do it well, > > there is also a mercurial respositor

Re: questions on development(7)

2007-11-09 Thread Tom Evans
On Fri, 2007-11-09 at 21:49 +0800, OutbackDingo wrote: > well thats kinda hard to do with CVS, though other revision systems such > as mercurial, bazaar, git and perforce, even subversion do it well, > there is also a mercurial respository for FreeBSD out there some where > > On Fri, 2007-11-09 at

Re: questions on development(7)

2007-11-09 Thread OutbackDingo
well thats kinda hard to do with CVS, though other revision systems such as mercurial, bazaar, git and perforce, even subversion do it well, there is also a mercurial respository for FreeBSD out there some where On Fri, 2007-11-09 at 05:36 +, Aryeh M. Friedman wrote: > >> > >> 2. If yes to #1

Re: questions on development(7)

2007-11-09 Thread Ian FREISLICH
"Aryeh M. Friedman" wrote: > First of all I am posting to both -current and -hackers because > -hackers seems to be very low volume. > > I just set up a master server development server using the procedure > in development(7) which was fairly clear but left a few questions > unanswered (and one od

Re: questions on development(7)

2007-11-09 Thread Eric Anderson
On Nov 8, 2007, at 11:36 PM, Aryeh M. Friedman wrote: 2. If yes to #1 how do I setup keeping everything except my modified code in sync (and if possible to retro activally apply patchs from the local branch unto the main source tree [/usr/src2]) You won't be able to commit to the BSD re

Re: questions on development(7)

2007-11-09 Thread Aryeh M. Friedman
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 OutbackDingo wrote: > well thats kinda hard to do with CVS, though other revision systems > such as mercurial, bazaar, git and perforce, even subversion do it > well, there is also a mercurial respository for FreeBSD out there > some where If I need t

Re: questions on development(7)

2007-11-09 Thread Stefan Sperling
On Fri, Nov 09, 2007 at 04:56:24AM +, Aryeh M. Friedman wrote: > 1. If I am modifing code and such should I have a local branch? You can either maintain a local branch or keep backing up your diffs against the main source tree. Which one is better depends on the size of your changes and your w

Re: questions on development(7)

2007-11-09 Thread Aryeh M. Friedman
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 > > > If you keep a local repo, and checkout from the local repo, then > your checkout will merge the changes (unless there are conflicts). Thanks the fact I know the answer you gave is quite simple but completely over my head shows I need a good tut

Re: questions on development(7)

2007-11-09 Thread Aryeh M. Friedman
>> >> 2. If yes to #1 how do I setup keeping everything except my modified >> code in sync (and if possible to retro activally apply patchs from the >> local branch unto the main source tree [/usr/src2]) > > You won't be able to commit to the BSD repo from your server. I > think you should treat

questions on development(7)

2007-11-09 Thread Aryeh M. Friedman
First of all I am posting to both -current and -hackers because -hackers seems to be very low volume. I just set up a master server development server using the procedure in development(7) which was fairly clear but left a few questions unanswered (and one odd behavior). I have only the master se