From owner-freebsd-current Sun Feb 16 14: 8:58 2003 Delivered-To: freebsd-current@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id A54F137B401; Sun, 16 Feb 2003 14:08:56 -0800 (PST) Date: Sun, 16 Feb 2003 16:08:56 -0600 From: Juli Mallett To: Chris BeHanna Cc: current@freebsd.org Subject: Re: Local repo: Perforce/CVS integration Message-ID: <20030216160856.A1028@FreeBSD.org> References: <200302161654.28280.chris@pennasoft.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200302161654.28280.chris@pennasoft.com>; from chris@pennasoft.com on Sun, Feb 16, 2003 at 04:54:28PM -0500 Organisation: The FreeBSD Project X-Alternate-Addresses: , , , , X-Towel: Yes X-LiveJournal: flata, jmallett X-Negacore: Yes 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 * De: Chris BeHanna [ Data: 2003-02-16 ] [ Subjecte: Local repo: Perforce/CVS integration ] > 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. FreeBSD has special great evil triggers which will import things into //depot/vendor/freebsd/src/... for example, and then we just branch off of there, and integ -b as needed. :) As for the CVS merge, I personally keep vendor/freebsd/src in my client view, as well, and use diff(1) to manually prepare both change diffs (modification) and additions, in whatever style I prefer. If it is just for review, I'd use diff2 :) Thanx, juli. -- Juli Mallett - AIM: BSDFlata -- IRC: juli on EFnet OpenDarwin, Mono, FreeBSD Developer - ircd-hybrid Developer, EFnet addict FreeBSD on MIPS-Anything on FreeBSD - Never trust an ELF, COFF or Mach-O! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message