Add notes about branch checkins

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5249dab..4a7c4f7 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * MAINTAINERS: Add notes about branch checkins.
+
 2001-07-05  Daniel Berlin  <dan@cgsoftware.com>
 
        * readelf.c (display_debug_macinfo): New function, display

diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
index 9220c73..4c50bd5 100644 (file)
--- a/binutils/MAINTAINERS
+++ b/binutils/MAINTAINERS
@@ -91,3 +91,15 @@ spelling mistakes, blatantly incorrect code (where the correct code is
 also blatantly obvious), and so on.  Obvious fixes should always be
 small, the larger they are, the more likely it is that they contain
 some un-obvious side effect or consequence.
+
+              --------- Branch Checkins ---------
+
+If a patch is approved for check in to the mainline sources, it can
+also be checked into the current release branch.  Normally however
+only bug fixes should be applied to the branch.  New features, new
+ports, etc, should be restricted to the mainline.  (Otherwise the
+burden of maintaining the branch in sync with the mainline becomes too 
+great).  If you are uncertain as to whether a patch is appropriate for
+the branch, ask the branch maintainer.  This is:
+
+ Philip Blundell  <philb@gnu.org>