From a64a85c67f65855375722a585022433acb2e5893 Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Fri, 14 Oct 2005 15:29:51 +0100 Subject: [PATCH] Mps: mps/master/index.html 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). Update procedure/version-create to require this, plus getting the p4 branch Description right and doing an empty-integrate of just-because-the-version-changed changes back to the master. Copied from Perforce Change: 155416 ServerID: perforce.ravenbrook.com --- mps/index.html | 29 ++++++++++++++++++++------ mps/procedure/version-create/index.txt | 14 +++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mps/index.html b/mps/index.html index 1747977c13c..489b932100e 100644 --- a/mps/index.html +++ b/mps/index.html @@ -38,13 +38,16 @@

1. Introduction

-

This document catalogues the master sources for the Memory Pool -System project. (See This document is the root of the Master version of the product +sources (See [RB 1999-05-20, 8] for a discussion of master sources, versions, and releases.)

-

This document will be modified as the master sources are +

This document catalogues the product sources for the Memory Pool +System project.

+ +

This document will be modified as the product sources are developed.

The readership of this document is the project developers, and also @@ -53,9 +56,9 @@ anyone interested in the project.

This document is not confidential.

-

2. Master sources

+

2. Product sources

-

The master sources are everything which is used to construct the +

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.

@@ -207,12 +210,26 @@ must therefore be branched and maintained in product versions.

+ + + 2005-10-14 + + RHSK + + 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). + + +

C. Copyright and License

-

This document is copyright © 2002 Ravenbrook Limited. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options.

+

This document is copyright © 2002-2005 Ravenbrook Limited. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/mps/procedure/version-create/index.txt b/mps/procedure/version-create/index.txt index d3cc2b032b7..faa12f00b7b 100644 --- a/mps/procedure/version-create/index.txt +++ b/mps/procedure/version-create/index.txt @@ -33,6 +33,10 @@ Entry in the table at . __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 . +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 Version> + p4 resolve -ay Version> + END OF PROCEDURE COPYRIGHT AND LICENSE