mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-27 01:01:52 -07:00
Code Issues Projects Releases Wiki Activity

Catch-up merge from master sources.

Browse source 
Copied from Perforce
 Change: 184676
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-03-07 17:29:25 +00:00
commit c3bbbe7d4a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mps/code/commpre.nmk
View file

@ -96,7 +96,7 @@ MPMCOMMON = <abq> <arena> <arenacl> <arenavm> <arg> <boot> <bt> \
<freelist> <global> <ld> <lockw3> <locus> <message> <meter> <mpm> \
<mpsi> <mpsiw3> <nailboard> <pool> <poolabs> <poolmfs> <poolmrg> \
<poolmv2> <poolmv> <protocol> <protw3> <range> <ref> <reserv> \
<ring> <root> <sac> <seg> <shield> <splay> <ss> <table> <thw3> \
<ring> <root> <sa> <sac> <seg> <shield> <splay> <ss> <table> <thw3> \
<trace> <traceanc> <tract> <vmw3> <walk>
PLINTH = <mpsliban> <mpsioan>
AMC = <poolamc>

6
mps/procedure/branch-merge.rst
View file

@ -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)::