Added a file to hold a list of changesets which are ready for merge, as a manually maintained alternative to 'Ready for merge' annotations in commit messages.

- Legacy-Id: 7255
2014-02-17 18:52:15 +00:00 · 2014-02-17 18:52:15 +00:00 · 4f84f7b5ac
parent 1c6c3835e8
commit 4f84f7b5ac
1 changed files with 10 additions and 0 deletions
--- a/10
+++ b/10
@ -0,0 +1,10 @@
+# By saying 'Ready for merge' in the commit message when you commit a change
+# to your branch, the commit will be included in the merge list for the next
+# release.  However, if a commit for some reason haven't is missing that
+# phrase in the commit comment, the branch and revision of the changeset can
+# be added to this file in trunk/ by the merge master, and it will also be
+# included in the merge list.
+
+# --- Add entries at the top ---
+
+personal/rjs/v4.90@7138		Was waiting for additional tests