1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-21 03:52:16 -08:00

Mps: propagate from master: making master/index.html easier to update

Copied from Perforce
 Change: 155417
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Kistruck 2005-10-14 15:31:42 +01:00
commit 759b331e71
2 changed files with 37 additions and 6 deletions

View file

@ -38,13 +38,16 @@
<h2><a name="section-1" id="section-1">1. Introduction</a></h2>
<p>This document catalogues the master sources for the Memory Pool
System project. (See <a
<p>This document is the root of the Master version of the product
sources (See <a
href="http://www.ravenbrook.com/doc/1999/05/20/pqtcm/#versions">[RB
1999-05-20, 8]</a> for a discussion of master sources, versions, and
releases.)</p>
<p>This document will be modified as the master sources are
<p>This document catalogues the product sources for the Memory Pool
System project.</p>
<p>This document will be modified as the product sources are
developed.</p>
<p>The readership of this document is the project developers, and also
@ -53,9 +56,9 @@ anyone interested in the project.</p>
<p>This document is not confidential. </p>
<h2><a id="section-2" name="section-2">2. Master sources</a></h2>
<h2><a id="section-2" name="section-2">2. Product sources</a></h2>
<p>The master sources are everything which is used to construct the
<p>The product sources are everything which is used to construct the
product and everything which is developed as the product develops, and
must therefore be branched and maintained in product versions.</p>
@ -207,12 +210,26 @@ must therefore be branched and maintained in product versions.</p>
</tr>
<tr valign="top">
<td> 2005-10-14 </td>
<td> <a href="mailto:rhsk@ravenbrook.com">RHSK</a> </td>
<td> This document has two roles: root of the product sources, and
root of the master version thereof. It now discusses these roles
separately, so that this document is easy to correct when branched.
(At which point it is still the root of the product sources, but no
longer of the master version thereof). </td>
</tr>
</table>
<h2><a id="section-C" name="section-C">C. Copyright and License</a></h2>
<p> This document is copyright &copy; 2002 <a href="http://www.ravenbrook.com/">Ravenbrook Limited</a>. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options. </p>
<p> This document is copyright &copy; 2002-2005 <a href="http://www.ravenbrook.com/">Ravenbrook Limited</a>. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options. </p>
<p> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: </p>

View file

@ -33,6 +33,10 @@ Entry in the table at <http://info.ravenbrook.com/project/mps/version/>.
__How to make a new version:__
1. Make the branch: p4 branch mps/version/A.BBB
Description:
Branching master sources for version A.BBB.
Always the whole of master:
//info.ravenbrook.com/project/mps/master/... //info.ravenbrook.com/project/mps/version/A.BBB/...
2. p4 integrate -b mps/version/A.BBB
@ -44,6 +48,16 @@ __How to make a new version:__
5. Update the table at <http://info.ravenbrook.com/project/mps/version/>.
6. Edit Master->Version in documents that erroneously say "Master".
Always edit version/A.BBB/index.html, eg. (case-sensitive):
"of the Master version" -> "of Version A.BBB"
"Master" -> "Version A.BBB"
Less importantly, edit various other files. See change 30260.
7. Do an empty-integrate of these changes back on to the masters, so P4 thinks it's done and doesn't keep suggesting it:
p4 integrate -r -b mps/version/A.BBB <Files Edited Master->Version>
p4 resolve -ay <Files Edited Master->Version>
END OF PROCEDURE
COPYRIGHT AND LICENSE