On 7-Sep-2010, bpabbott wrote:
| My build was successful ... this change was much easier than I'd expected.
| Since I'm in unfamiliar waters, it would be wise to someone more knowledgeable
| to check the changeset before it is committed.
When moving/renaming files, it is probably best to use "hg rename" for
each file so that Mercurial knows about the name change. At least I
think that is how it is supposed to work. So in the case of
acx_pthreadm4, I would do
hg rename acx_pthread.m4 ax_pthread.m4
cp new-ax_pthread.m4 ax_pthread.m4
This will allow Mercurial to generate a more compact diff that looks
like this:
diff --git a/m4/acx_pthread.m4 b/m4/ax_pthread.m4
rename from m4/acx_pthread.m4
rename to m4/ax_pthread.m4
--- a/m4/acx_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -1,10 +1,10 @@
# ===========================================================================
-#
http://www.nongnu.org/autoconf-archive/acx_pthread.html
+#
http://www.gnu.org/software/autoconf-archive/ax_pthread.html
# ===========================================================================
#
# SYNOPSIS
#
-# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
#
# DESCRIPTION
#
...
...
...
instead of showing only that one file was deleted and another was added.
Will you please rework the changeset to use this method of renaming
and modifying the files?
I'd also recommend that you add
[diff]
git = 1
to your ~/.hgrc file.
Finally, it's a nit, but I think you mean ax_*.m4, not ac_*.m4 in the
ChangeLog entry.
Thanks,
jwe
changeset-m4.patch