[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-187-g9998655

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=999865553137b48a0770b5073cfd4f91c1e49593

The branch, maint has been updated
       via  999865553137b48a0770b5073cfd4f91c1e49593 (commit)
       via  c2ff7e81110e29c37fdbb8938407c25049e46813 (commit)
      from  9c9cf0d89bc1b5bdafd9fc8a42254f42c3935d5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 999865553137b48a0770b5073cfd4f91c1e49593
Author: Stefano Lattarini <address@hidden>
Date:   Thu Aug 19 00:05:27 2010 +0200

    HACKING: Perl 4 is obsolete.
    
    * HACKING (Editing automake.in and aclocal.in): Remove note about
    Perl 5.

commit c2ff7e81110e29c37fdbb8938407c25049e46813
Author: Stefano Lattarini <address@hidden>
Date:   Thu Aug 19 00:04:34 2010 +0200

    HACKING: improve description of git "bugfix branches".
    
    * HACKING (Working with git): Extend the description of git
    "bugfix branches".

-----------------------------------------------------------------------

Summary of changes:
 HACKING |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HACKING b/HACKING
index 8480f7c..d9b2099 100644
--- a/HACKING
+++ b/HACKING
@@ -86,8 +86,6 @@
   &, just convert the old code as you work on it, and write new
   code without.
 
-* Perl 5 is now OK.
-
 ================================================================
 = Working with git
 
@@ -139,9 +137,11 @@
   # if all seems ok, then actually push:
   git push origin maint branch-1.11 master
 
-* For bug fixes of long-standing bugs, it may be useful to commit them to
-  a new branch based off of the commit that introduced the bug, and merge
-  this bugfix branch into active branches that descend from the buggy commit.
+* When fixing a bug (especially a long-standing one), it may be useful
+  to commit the fix to a new temporary branch based off the commit that
+  introduced the bug.  Then this "bugfix branch" can be merged into all
+  the active branches descending from the buggy commit.  This offers a
+  simple way to fix the bug consistently and effectively.
 
 * There may be a number of longer-lived feature branches for new developments.
   They should be based off of a common ancestor of all active branches to


hooks/post-receive
-- 
GNU Automake