[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-276-gb0f2ede

[Ralf Wildenhues]

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=b0f2ede9807465c3238f40ea00d7355f9de90856

The branch, master has been updated
       via  b0f2ede9807465c3238f40ea00d7355f9de90856 (commit)
       via  3396f9a4e3d202bc65ca029dd49e82bba0a4b08f (commit)
       via  b1d818382c5e753f829a35471a1db4c6a45e1134 (commit)
       via  294d1bf8f71a53dafbde03f6fd7e29816216dacd (commit)
      from  dd5ce94c457b8282b2da4ddb5e0fec7b8c9df20f (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 b0f2ede9807465c3238f40ea00d7355f9de90856
Merge: dd5ce94 3396f9a
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jul 31 17:02:43 2010 +0200

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog         |   17 +++++++++++++++++
 HACKING           |   28 ++++++++++++++++++++++++++++
 THANKS            |    2 ++
 doc/automake.texi |   13 ++++++++++++-
 4 files changed, 59 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3db22d..5ed00c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-31  Ralf Wildenhues  <address@hidden>
+
+       Add example git work flow; discuss merge --log in HACKING.
+       * HACKING: Update.
+       Suggestion by Stefano Lattarini.
+
+       Add more hints for debugging make rules.
+       * doc/automake.texi (Debugging Make Rules): Show command to find
+       out expanded values of variables; point to makefile debugger.
+       * THANKS: Update.
+       Prompted by suggestion from Ludovic Courtès and Andy Wingo.
+
+2010-07-27  Patrick Welche  <address@hidden>  (tiny change)
+
+       Fix typo in the manual.
+       * doc/automake.texi (Scripts): Fix typo.
+
 2010-07-27  Ralf Wildenhues  <address@hidden>
 
        Document current policy for development with git.
diff --git a/HACKING b/HACKING
index a4c918a..ad0ae49 100644
--- a/HACKING
+++ b/HACKING
@@ -113,6 +113,30 @@
   suitable testing.  It is advisable to merge only after a set of related
   commits have been applied.
 
+* Example work flow for patches to maint:
+
+  # 1. Checkout the "maint" branch:
+  git checkout maint
+
+  # 2. Apply the patch(es) with "git am" (or create them with $EDITOR):
+  git am -3 0*.patch
+  # 2a. Run required tests, if any ...
+
+  # 3. Merge maint into branch-1.11:
+  git checkout branch-1.11
+  git merge maint
+  # 3a. Run required tests, if any ...
+
+  # 4. Redo steps 3 and 3a for master:
+  git checkout master
+  git merge maint
+  # testing ...
+
+  # 5. Push the maint and master branches:
+  git push --dry-run origin maint branch-1.11 master
+  # 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.
@@ -123,6 +147,10 @@
   common ground for feature merging and testing, should they not be ready
   for master yet.
 
+* For merges from branches other than maint, prefer 'git merge --log' over
+  plain 'git merge', so that a later 'git log' gives an indication of which
+  actual patches were merged even when they don't appear early in the list.
+
 * master and release branches should not be rewound, i.e., should always
   fast-forward, except maybe for privacy issues.  The maint branch should not
   be rewound except maybe after retiring a release branch or a new stable
diff --git a/THANKS b/THANKS
index d694f48..810a700 100644
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ Andreas Schwab                address@hidden
 Andrew Cagney          address@hidden
 Andrew Suffield                address@hidden
 Andris Pavenis         address@hidden
+Andy Wingo             address@hidden
 Angus Leeming          address@hidden
 Anthony Green          address@hidden
 Antonio Diaz Diaz      address@hidden
@@ -194,6 +195,7 @@ Laurent Morichetti  address@hidden
 Leo Davis              address@hidden
 Leonardo Boiko         address@hidden
 Loulou Pouchet         address@hidden
+Ludovic Courtès               address@hidden
 Luo Yi                 address@hidden
 Maciej Stachowiak      address@hidden
 Maciej W. Rozycki      address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 9f5b3bd..b79e955 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6912,7 +6912,7 @@ script is distributed in its final, installable form, the
 dist_bin_SCRIPTS = my_script
 @end example
 
-Script are not distributed by default; as we have just seen, those
+Scripts are not distributed by default; as we have just seen, those
 that should be distributed can be specified using a @code{dist_}
 prefix as with other primaries.
 
@@ -11691,6 +11691,17 @@ prerequisites for the @file{Makefile} file itself even 
with @option{-n}
 @code{make SHELL="/bin/bash -vx"} can help debug complex rules.
 @xref{The Make Macro SHELL,,, autoconf, The Autoconf Manual}, for some
 portability quirks associated with this construct.
address@hidden
address@hidden 'print: ; @@echo "$(VAR)"' | make -f Makefile -f - print}
+can be handy to examine the expanded value of variables.  You may need
+to use a target other than @samp{print} if that is already used or a
+file with that name exists.
address@hidden
address@hidden://bashdb.sourceforge.net/@/remake/} provides a modified
+GNU @command{make} command called @command{remake} that copes with
+complex GNU @command{make}-specific Makefiles and allows to trace
+execution, examine variables, and call rules interactively, much like
+a debugger.
 @end itemize
 
 


hooks/post-receive
-- 
GNU Automake