From owner-freebsd-questions@FreeBSD.ORG Thu Jan 11 20:08:14 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2ABD216A415 for ; Thu, 11 Jan 2007 20:08:14 +0000 (UTC) (envelope-from msoulier@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.188]) by mx1.freebsd.org (Postfix) with ESMTP id F137113C46A for ; Thu, 11 Jan 2007 20:08:12 +0000 (UTC) (envelope-from msoulier@gmail.com) Received: by nf-out-0910.google.com with SMTP id k27so993690nfc for ; Thu, 11 Jan 2007 12:08:12 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=cJDoO1OvbRJOP5FmQ/UN4bKs+VdJk/5/O9rF3s/bYR3sQKqm8YWA4Wwoy6z6kOnHFdAtW3a1MGsP9dWlZ/gKlQ+Gu5B+QrpTbROPR0pLO0aLHDMvVsvMfSS3u8Z7TVCTlZJHKXWZDIu74wcJQwks+q6b8jtdJUjZk1CuQ3h9nsk= Received: by 10.82.136.4 with SMTP id j4mr403129bud.1168546092572; Thu, 11 Jan 2007 12:08:12 -0800 (PST) Received: by 10.82.170.18 with HTTP; Thu, 11 Jan 2007 12:08:06 -0800 (PST) Message-ID: Date: Thu, 11 Jan 2007 15:08:06 -0500 From: "Michael P. Soulier" Sender: msoulier@gmail.com To: "Doug Hardie" In-Reply-To: <3C109E4B-5636-498F-A7C2-0C728ED0E81D@lafn.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <3C109E4B-5636-498F-A7C2-0C728ED0E81D@lafn.org> X-Google-Sender-Auth: 5c70ab66176c8378 Cc: freebsd-questions Subject: Re: Use of CVS X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2007 20:08:14 -0000 On 1/11/07, Doug Hardie wrote: > one for the new development or the other way around. Will it be > easier to merge the fixes to the production branch back in to the new > system later or should those fixes be made to both branches at the > same time? Any suggestions on these approaches will be appreciated. > Thanks, This is really a basic stream management question, not specific to freebsd, or CVS for that matter. Perhaps you should reference one of numerous texts on stream management, and find a development model that is most comfortable for you. Mike -- Michael P. Soulier "Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction." --Albert Einstein