Re: Branches in CVS repository?

[Mark Mitchell <mark at codesourcery dot com>]

Nick Clifton wrote:
> Hi Mark,
>
> > I suggest the following: I'll prepare a patch for binutils/MAINTAINERS 
> > that explains the policy, and submit it.  When I do that, you can 
> > decide whether you want to require the <date> portion of the branch 
> > name, and, if so, I will adjust the MAINTAINERS file before 
> > committing.  Is that a reasonable way to proceed?
>
>
> Yes - that would be excellent.

OK, here's an attempt.  Thoughts?  OK to commit?

--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com
(916) 791-8304

Index: MAINTAINERS
===================================================================
RCS file: /cvs/src/src/binutils/MAINTAINERS,v
retrieving revision 1.78
diff -c -5 -p -r1.78 MAINTAINERS
*** MAINTAINERS	16 Jan 2005 23:47:40 -0000	1.78
--- MAINTAINERS	19 Jan 2005 17:03:22 -0000
*************** Patches to the top level configure files
*** 166,170 ****
--- 166,221 ----
  are not the domain of the binutils project and they cannot be approved
  by the binutils group.  Instead they should be submitted to the config
  maintainer at:
  
  	config-patches@gnu.org
+ 
+     --------- Creating Branches ---------
+ 
+ Anyone with at least write-after-approval access may create a branch
+ to use for their own development purposes.  In keeping with FSF
+ policies, all patches applied to such a branch must come from people
+ with appropriate copyright assignments on file.  
+ 
+ Before creating the branch, you should select a name for the branch of
+ the form:
+ 
+   binutils-<org>-<name> 
+ 
+ where "org" is the initials of your organization, or your own initials
+ if you are acting as an individual.  For example, for a branch created
+ by The GNUDist Company, "tgc" would be an appropriate choice for
+ "org".  It's up to each organization to select an appropriate choice
+ for "name"; some organizations may use more structure than others, so
+ "name" may contain additional hyphens.
+ 
+ Suppose that The GNUDist Company was creating a branch to develop a
+ port of Binutils to the FullMonty processor.  Then, an appropriate
+ choice of branch name would be:
+ 
+   binutils-tgc-fm
+ 
+ Having selected the branch name, create the branch as follows:
+ 
+ 1. Check out binutils, so that you have a CVS checkout corresponding
+    to the initial state of your branch.
+ 
+ 2. Create a tag:
+ 
+      cvs tag binutils-<org>-<name>-branchpoint
+ 
+    That tag will allow you, and others, to easily determine what's
+    changed on the branch relative to the initial state.
+ 
+ 3. Create the branch:
+ 
+      cvs rtag -b -r binutils-<org>-<name>-branchpoint \
+        binutils-<org>-<name>-branch 
+ 
+ 4. Document the branch:
+ 
+      Add a description of the branch to BRANCHES, and check that file
+      in.  All branch descriptions should be added to the HEAD revision
+      of the file; it doesn't help to modify BRANCHES on a branch!
+ 
+ Please do not commit any patches to a branch you did not create
+ without the explicit permission of the person who created the branch.
Index: BRANCHES
===================================================================
RCS file: BRANCHES
diff -N BRANCHES
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- BRANCHES	19 Jan 2005 17:03:22 -0000
***************
*** 0 ****
--- 1,9 ----
+ Please keep the following tables alphabetical.
+ 
+ Organization		Organization Name
+ ------------		-----------------
+ tgc			The GNUDist Company	
+ 	
+ Branch			Description
+ ------			-----------
+ binutils-tgc-fm		FullMonty port