[p4] Preventing Merging into a branch

Maynard, James (FN,IE) @ Nautronix James.Maynard at Nautronix.com.au
Wed Sep 6 17:50:53 PDT 2006


A couple of questions,

Is it possible to somehow only permit merging into one branch from a
specified branch? We want to restrict merges into "Stable" so that they
only come from "Main". 

Also Is it somehow possible to to ensure that a specific attribute is
set on all the files involved in a merge onto stable before permitting
the merge to go ahead? We want to ensure that the "Peer Reviewed"
attribute is set before moving onto the "Stable" branch.

James Maynard
Senior Software Engineer
L-3 Communications Nautronix Limited ABN 28 009 019 603
108 Marine Terrace, Fremantle, WA 6160, Australia
T +61 (0) 8 9431 0000,  F +61 (0) 8 9430 5901
E james.maynard at nautronix.com.au
www.L-3Com.com/nautronix


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Weintraub,
David
Sent: Thursday, 7 September 2006 2:03 AM
To: Roger Day; perforce-user at perforce.com
Cc: Roger Barnett
Subject: Re: [p4] rcstoperforce.sh

If you can't find the RCS to Perforce conversion, first convert your RCS
repository to CVS, then use the cvs2p4 scripts. I've done RCS to CVS
conversions, and it's pretty darn simple. Basically putting your RCS
files in a repository, and creating the necessary CVS files in the
CVSROOT directory (like modules, etc.).

You can find out more information about converting from RCS to CVS at
<http://www.gigascale.org/softdevel/faq/17.html>.

Basic directions are here:

Migration from RCS to CVS is a relatively painless process. CVS uses RCS
for all of its file level version control, and so RCS files can be
directly copied into a CVS repository. 

In converting from RCS to CVS, make sure that you follow these steps: 

* Create a CVS repository. Within this repository you should create an
empty directory structure to hold the RCS files. 
* Keep a backup copy of your RCS files in their original location just
in case there are any mishaps. 
* Copy the files into the repository using the standard unix file copy
utilities (cp -rp is useful, as is tar). 
* Update the modules file in CVSROOT. This can be updated using cvs co
modules or cvs co CVSROOT, editing the modules file, and checking it
back in again. You should make sure that there is an entry in the
modules file for every directory (top level and subdirectory) in the
repository. 
* Test the change by attempting to cvs co a few of the new modules you
have created, and running cvs log or cvs status on some of the files you
have checked out. 
 

-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Roger Day
Sent: Wednesday, September 06, 2006 11:01 AM
To: perforce-user at perforce.com
Cc: Roger Barnett
Subject: [p4] rcstoperforce.sh

Looking at the perforce website, it tells me that there's a script for
translating rcs files to perforce format. However, when I go to the
patch and to the ftp site, I see it's been expunged. What is the latest
method for importing rcs files into perforce?

Roger
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user

-- 

CONFIDENTIALITY NOTE:This electronic transmission, including all attachments, is
directed in confidence solely to the person(s) to whom it is addressed, or an 
authorized recipient, and may not otherwise be distributed, copied or disclosed.
The contents of the transmission may also be subject to intellectual property 
rights and all such rights are expressly claimed and are not waived. If you have 
received this transmission in error, please notify the sender immediately by 
return electronic transmission and then immediately delete this transmission, 
including all attachments, without copying, distributing or disclosing same.




More information about the perforce-user mailing list