[Python-apps-commits] r8424 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Tuesday, April 3, 2012 @ 20:55:06
  Author: vicho
Revision: 8424

Import 91eec29dd7de from upstream to fix the test-suite failures in mips and sparc

Added:
  packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-04-03 20:36:18 UTC (rev 8423)
+++ packages/mercurial/trunk/debian/changelog	2012-04-03 20:55:06 UTC (rev 8424)
@@ -1,8 +1,10 @@
 mercurial (2.1.2-2) unstable; urgency=low
 
   * Add sparc to the list of architectures with slow buildds
+  * Import 91eec29dd7de from upstream to fix the test-suite failures in
+    mips and sparc
 
- -- Javi Merino <vicho at debian.org>  Tue, 03 Apr 2012 21:04:29 +0100
+ -- Javi Merino <vicho at debian.org>  Tue, 03 Apr 2012 21:54:05 +0100
 
 mercurial (2.1.2-1) unstable; urgency=low
 

Added: packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	2012-04-03 20:55:06 UTC (rev 8424)
@@ -0,0 +1,14 @@
+Author: Matt Mackall <mpm at selenic.com>
+Description: tests: re-silence test-bad-pull log messages
+Origin: upstream, http://selenic.com/hg/rev/91eec29dd7de
+
+diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
+--- a/tests/test-bad-pull.t
++++ b/tests/test-bad-pull.t
+@@ -25,6 +25,3 @@
+   abort: HTTP Error 404: * (glob)
+   [255]
+   $ wait $P
+-  $ cat log
+-  localhost - - [*] code 404, message File not found (glob)
+-  localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-04-03 20:36:18 UTC (rev 8423)
+++ packages/mercurial/trunk/debian/patches/series	2012-04-03 20:55:06 UTC (rev 8424)
@@ -8,3 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
+from_upstream__tests_re_silence_test_bad_pull_log_messages.patch