From 15134f454243e80be815e9e61545cccdbb74ea26 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Fri, 7 Mar 2014 17:23:15 +0000 Subject: [PATCH] Emphasize the need to check that the test suite passes on all supported platforms. Copied from Perforce Change: 184674 ServerID: perforce.ravenbrook.com --- mps/procedure/branch-merge.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mps/procedure/branch-merge.rst b/mps/procedure/branch-merge.rst index 232a5a925b4..9730a7d5726 100644 --- a/mps/procedure/branch-merge.rst +++ b/mps/procedure/branch-merge.rst @@ -70,7 +70,7 @@ This document contains procedures and checklists for branching and merging durin #. Is there an automated test case? -#. Does the test suite pass? +#. Does the test suite pass on all supported platforms? #. If there are interface changes, is there documentation? @@ -103,8 +103,8 @@ This document contains procedures and checklists for branching and merging durin p4 submit -d "Catch-up merge from the master sources to $BRANCH" -#. Update the branch on other platforms and check that the test suite - passes. +#. Update the branch on all supported platforms and check that the + test suite passes. #. Backward merge into the master sources (or the appropriate customer-specific mainline)::