From owner-freebsd-current Sun Feb 16 13:53:29 2003 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1021F37B401 for ; Sun, 16 Feb 2003 13:53:28 -0800 (PST) Received: from pennasoft.com (pennasoft.com [192.220.103.128]) by mx1.FreeBSD.org (Postfix) with SMTP id A909B43F75 for ; Sun, 16 Feb 2003 13:53:27 -0800 (PST) (envelope-from chris@pennasoft.com) Received: (qmail 97234 invoked by uid 26496); 16 Feb 2003 21:53:26 -0000 Received: from unknown (HELO browning.pennasoft.com) ([192.220.103.128]) (envelope-sender ) by 192.220.103.128 (qmail-ldap-1.03) with SMTP for ; 16 Feb 2003 21:53:26 -0000 From: Chris BeHanna Organization: PennaSoft Corporation To: current@freebsd.org Subject: Local repo: Perforce/CVS integration Date: Sun, 16 Feb 2003 16:54:28 -0500 User-Agent: KMail/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200302161654.28280.chris@pennasoft.com> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG For those of you doing development with Perforce, could you talk a little bit about how this is done? Do you do a cvsup nightly and import that on a vendor branch, then integrate it into your working tree? (That sounds like it would work.) Do you use cvs2p4? How about going in the other direction (from your local branches back to the trunk?) I'm reasonably well-versed in both CVS and Perforce, and Perforce just does merging *so* much better than CVS that'd I'd rather use it, but I'd also rather crib from someone who has a process that's working, rather than roll my own. Thanks, -- Chris BeHanna http://www.pennasoft.com Principal Consultant PennaSoft Corporation chris@pennasoft.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message