From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 15 May 2012 16:25:20 +0000 (-0400)
Subject: Create ChangeLog from default branch now that the 1.8 branch is
X-Git-Tag: SUDO_1_8_5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=533c822469ef9ddf2ebc9109d80157939a5cd400;p=sudo

Create ChangeLog from default branch now that the 1.8 branch is
only used for building releases.

--HG--
branch : 1.8
---

diff --git a/Makefile.in b/Makefile.in
index 6b479db69..1fbed4cd0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,10 +142,9 @@ depend: siglist.c
 	    --file $(srcdir)/plugins/system_group/Makefile \
 	    --file $(srcdir)/src/Makefile --file $(srcdir)/zlib/Makefile
 
-# The 1.8 branch started February 25, 2011
 ChangeLog:
 	if test -d $(srcdir)/.hg && cd $(srcdir); then \
-	    if hg log --style=changelog -b 1.8 > $@.tmp && hg log --style=changelog -b default --date '<2011-02-25 21:30:00' >> $@.tmp; then \
+	    if hg log --style=changelog -b default > $@.tmp; then \
 		mv -f $@.tmp $@; \
 	    else \
 		rm -f $@.tmp; \