Re: Local repo: Perforce/CVS integration
Le 2003-02-16, Chris BeHanna écrivait : Do you use cvs2p4? How about going in the other direction (from your local branches back to the trunk?) VCP is also a nice solution for moving changes across CVS and Perforce repositories. I use it to update a read-only CVS pserver view of a project that is developed using Perforce (http://libre.act-europe.fr/polyorb, for those interested :) ). Info on VCP can be found at http://aspn.activestate.com/ASPN/CodeDoc/VCP/VCP/Source/revml.html Thomas. -- [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Local repo: Perforce/CVS integration
In message: [EMAIL PROTECTED] Mathieu Arnold [EMAIL PROTECTED] writes: : This does not answer to the question :) p4 changes -m 10 Change 25340 on 2003/02/17 by importer@updater 'Import at Mon Feb 17 11:05:36 P' ... importer is the magic behind the scenes. Warner To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Local repo: Perforce/CVS integration
--En cette belle journée du lundi 17 février 2003 12:11 -0700 -- M. Warner Losh [EMAIL PROTECTED] écrivait : | In message: [EMAIL PROTECTED] | Mathieu Arnold [EMAIL PROTECTED] writes: | : This does not answer to the question :) | | p4 changes -m 10 | Change 25340 on 2003/02/17 by importer@updater 'Import at Mon Feb 17 | 11:05:36 P' ... | | importer is the magic behind the scenes. That, I already saw, my question was more like, is it a cron which cvs up every once in a while, looks at which files were modified/added/deleted, issue the right p4 edit/add/delete commands, and p4 submits it, or, but I doubt it, is triggered by cvs commits and submits every separate commit as a separate change ? -- Mathieu Arnold To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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. Thanks, -- Chris BeHanna http://www.pennasoft.com Principal Consultant PennaSoft Corporation [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Local repo: Perforce/CVS integration
* 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
Re: Local repo: Perforce/CVS integration
--En cette belle journée du dimanche 16 février 2003 16:08 -0600 -- Juli Mallett [EMAIL PROTECTED] écrivait : | 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. | | :) Are these triggers top secret, or would it be possible to share them with the rest of us ? -- Mathieu Arnold To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Local repo: Perforce/CVS integration
* De: Mathieu Arnold [EMAIL PROTECTED] [ Data: 2003-02-17 ] [ Subjecte: Re: Local repo: Perforce/CVS integration ] --En cette belle journée du dimanche 16 février 2003 16:08 -0600 -- Juli Mallett [EMAIL PROTECTED] écrivait : | 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. | | :) Are these triggers top secret, or would it be possible to share them with the rest of us ? When i said triggers above, I was thinking of something else, what I was referring to is actually a periodic (or manually kicked off) job to import things to the vendor area. -- 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
Re: Local repo: Perforce/CVS integration
--En cette belle journée du lundi 17 février 2003 01:21 -0600 -- Juli Mallett [EMAIL PROTECTED] écrivait : | * De: Mathieu Arnold [EMAIL PROTECTED] [ Data: 2003-02-17 ] | [ Subjecte: Re: Local repo: Perforce/CVS integration ] | --En cette belle journée du dimanche 16 février 2003 16:08 -0600 | -- Juli Mallett [EMAIL PROTECTED] écrivait : | | 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. | | | | :) | | Are these triggers top secret, or would it be possible to share them with | the rest of us ? | | When i said triggers above, I was thinking of something else, what I was | referring to is actually a periodic (or manually kicked off) job to import | things to the vendor area. This does not answer to the question :) -- Mathieu Arnold To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
