[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    /pidgin/main: 6016f081e2fa: Merged in dequisdequis/pidgin/releas...
From:       Gary Kramlich <grim () reaperworld ! com>
Date:       2016-10-19 17:52:53
Message-ID: hg.6016f081e2fa.1476899573.-874508059 () rock ! pidgin ! im
[Download RAW message or body]

Changeset: 6016f081e2faa63f2a77589230ea58343c8392c4
Author:	 Gary Kramlich <grim@reaperworld.com>
Date:	 2016-10-19 17:52 +0000
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/6016f081e2fa

Description:

Merged in dequisdequis/pidgin/release-2.x.y (pull request #155)

Makefile: Use hg log instead of hg id --debug, which has unstable output

diffstat:

 Makefile.am |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,8 +50,8 @@ version-check:
 	head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
 
 # Ensure we're working from a tag...
-	test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i \
                --debug`
-# ... and have no changes in the working copy. (this isn't really necessary with hg \
because hg id appends a "+") +	test x`hg log -r "tag($(PACKAGE_VERSION))" --template \
"{node}"` = x`hg log -r . -T '{node}'` +# ... and have no changes in the working \
copy.  test "x`hg st -mard`" = x
 
 sign-packages: dist
@@ -82,7 +82,7 @@ endif
 # successfully; the rm -f ensures both
 package_revision_raw.txt: .FORCE
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \
+	(hg --cwd $(srcdir) log -r . -T {node}) 2>/dev/null >$@.new \
 	|| rm -f $@.new
 	$(AM_V_at)if test -f $@.new; then \
 		if ! diff $@ $@.new > /dev/null; then \

_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits


[prev in list] [next in list] [prev in thread] [next in thread]