* De: Chris BeHanna <[EMAIL PROTECTED]> [ 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 <[EMAIL PROTECTED]> - 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 [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
