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

[vicho at users.alioth.debian.org]

    Date: Sunday, April 19, 2015 @ 10:18:30
  Author: vicho
Revision: 11857

Delete patch for_upstream__lenient_test-shelve.patch which is applied upstream

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2015-04-19 10:18:23 UTC (rev 11856)
+++ packages/mercurial/trunk/debian/changelog	2015-04-19 10:18:30 UTC (rev 11857)
@@ -1,6 +1,8 @@
 mercurial (3.4~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Delete patch for_upstream__lenient_test-shelve.patch which is
+    applied upstream
 
  -- Javi Merino <vicho at debian.org>  Sun, 19 Apr 2015 10:38:59 +0100
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2015-04-19 10:18:23 UTC (rev 11856)
+++ packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2015-04-19 10:18:30 UTC (rev 11857)
@@ -1,24 +0,0 @@
-Author: Tristan Seligmann <mithrandi at debian.org>
-Description: Make test-shelve.t more lenient
- When running on a slower system (eg. MIPS buildd), the age of the shelf can be
- 10 seconds or more, resulting in the output alignment changing and thus a test
- failure. This patch makes the spacing be matched more leniently.
-Bug: http://bz.selenic.com/show_bug.cgi?id=4124
-
---- a/tests/test-shelve.t
-+++ b/tests/test-shelve.t
-@@ -81,11 +81,11 @@ the common case - no options or filename
- ensure that our shelved changes exist
- 
-   $ hg shelve -l
--  default-01      (*)    changes to '[mq]: second.patch' (glob)
--  default         (*)    changes to '[mq]: second.patch' (glob)
-+  default-01      (*)* changes to '[mq]: second.patch' (glob)
-+  default         (*)* changes to '[mq]: second.patch' (glob)
- 
-   $ hg shelve -l -p default
--  default         (*)    changes to '[mq]: second.patch' (glob)
-+  default         (*)* changes to '[mq]: second.patch' (glob)
-   
-   diff --git a/a/a b/a/a
-   --- a/a/a

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2015-04-19 10:18:23 UTC (rev 11856)
+++ packages/mercurial/trunk/debian/patches/series	2015-04-19 10:18:30 UTC (rev 11857)
@@ -4,5 +4,4 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
-for_upstream__lenient_test-shelve.patch
 deb_specific__fix_fhs_paths.patch