From owner-freebsd-net@FreeBSD.ORG Sun Dec 19 17:32:30 2004 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EC7C16A4CE; Sun, 19 Dec 2004 17:32:30 +0000 (GMT) Received: from stephanie.unixdaemons.com (stephanie.unixdaemons.com [67.18.111.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0FB143D48; Sun, 19 Dec 2004 17:32:29 +0000 (GMT) (envelope-from bmilekic@technokratis.com) Received: from stephanie.unixdaemons.com (bmilekic@localhost.unixdaemons.com [127.0.0.1])iBJHWRYk072769; Sun, 19 Dec 2004 12:32:27 -0500 (EST) Received: (from bmilekic@localhost) by stephanie.unixdaemons.com (8.13.1/8.12.1/Submit) id iBJHWR5K072768; Sun, 19 Dec 2004 12:32:27 -0500 (EST) (envelope-from bmilekic@technokratis.com) X-Authentication-Warning: stephanie.unixdaemons.com: bmilekic set sender to bmilekic@technokratis.com using -f Date: Sun, 19 Dec 2004 12:32:27 -0500 From: Bosko Milekic To: Max Laier Message-ID: <20041219173227.GA72013@technokratis.com> References: <200412191820.23664.max@love2party.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200412191820.23664.max@love2party.net> User-Agent: Mutt/1.4.2.1i cc: freebsd-net@freebsd.org cc: gnn@freebsd.org Subject: Re: Dingo and PerForce X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 17:32:30 -0000 This way he can push changes back into 'dingo' before pushing them back into HEAD. It makes a lot of sense, actually, to do this sort of 3-tier approach when multiple people are working on different parts of a larger sub-project, like for example dingo. HEAD (top, must work) <-- (dingo, pre-production, test all changes together) <-- (your individual branch, single set of changes). You develop in your individual branch, test your changes. If all is well, you push into dingo, where changes get tested with respect to other dingo-related changes (which have not yet been pushed into HEAD). When it's all ready, everything gets pushed at once into HEAD, or in pieces, but you know that the individual pieces work well together. This is because dingo changes less often than HEAD. -Bosko On Sun, Dec 19, 2004 at 06:20:17PM +0100, Max Laier wrote: > On Sunday 19 December 2004 05:23, gnn@FreeBSD.org wrote: > > For those who use PerForce and want to work on Dingo there is > > now a dingo branch, named "dingo". The dingo branch contains > > all of src, not just sys, as I suspect there are userland bits > > we'll want to do. I know I'll be doing userland things. > > Please make your own sub-branch off of dingo. For example, > > here is mine (gnn_dingo): > <...> > > The main branch (dingo) is locked against changes and, more > > importantly, accidental deletion. Let me know if there are any issues > > with any of this. > > > > Oh, and the integration from vendor to dingo was done last Saturday > > night around 23:00 JST. > > I am not all that familiar with perforce so I am wondering: What is the > benefit of having this branch if it will be tracking HEAD anyway, we can just > branch off the normal vendor branch. Or do you plan to integrate parts back? > > I have 'mlaier_carp2' off the vendor branch. What will be the benefit if I > move it to 'dingo' instead? > > -- > /"\ Best regards, | mlaier@freebsd.org > \ / Max Laier | ICQ #67774661 > X http://pf4freebsd.love2party.net/ | mlaier@EFnet > / \ ASCII Ribbon Campaign | Against HTML Mail and News -- Bosko Milekic bmilekic@technokratis.com bmilekic@FreeBSD.org