[PATCHES] Two small improvements to HACKING

[Stefano Lattarini]

Stefano Lattarini (2):
  HACKING: improve description of git "bugfix branches".
  HACKING: acknowledge Perl 4 as utterly obsolete.

 HACKING |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

-*-*-

OK for maint?

Regards,
  Stefano

From 9b1532f7d4ffea02157899c33b87289c277f454b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Thu, 19 Aug 2010 00:04:34 +0200
Subject: [PATCH 1/2] HACKING: improve description of git "bugfix branches".

* HACKING (Working with git): Extend and make less terse the
description of git "bugfix branches".
---
 HACKING |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HACKING b/HACKING
index 8480f7c..62af1ec 100644
--- a/HACKING
+++ b/HACKING
@@ -139,9 +139,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
-- 
1.7.1

From 8d0f37e1bf7581dd51455711eb211d22e5d5bf6a Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Thu, 19 Aug 2010 00:05:27 +0200
Subject: [PATCH 2/2] HACKING: acknowledge Perl 4 as utterly obsolete.

* HACKING (Editing automake.in and aclocal.in): Don't tell that Perl 5
is OK now: that's obvious!   In fact, I'd be surprised to see anyone
still using Perl 4...
---
 HACKING |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index 62af1ec..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
 
-- 
1.7.1