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

[vicho at users.alioth.debian.org]

    Date: Friday, March 2, 2012 @ 23:22:44
  Author: vicho
Revision: 8257

Drop from_upstream__test_check_code_hg_skip_test_if_not_wd.patch which is now included upstream

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-03-02 23:22:12 UTC (rev 8256)
+++ packages/mercurial/trunk/debian/changelog	2012-03-02 23:22:44 UTC (rev 8257)
@@ -3,8 +3,10 @@
   * New upstream version 2.1.1-1
   * Change the group of the test dir in test-inherit-mode.t so that the
     testsuite doesn't fail in kfreebsd-*
+  * Drop from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
+    which is now included upstream
 
- -- Javi Merino <vicho at debian.org>  Fri, 02 Mar 2012 22:53:43 +0000
+ -- Javi Merino <vicho at debian.org>  Fri, 02 Mar 2012 23:16:10 +0000
 
 mercurial (2.1-3) experimental; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch	2012-03-02 23:22:12 UTC (rev 8256)
+++ packages/mercurial/trunk/debian/patches/from_upstream__test_check_code_hg_skip_test_if_not_wd.patch	2012-03-02 23:22:44 UTC (rev 8257)
@@ -1,18 +0,0 @@
-From: Greg Ward <greg at gerg.ca>
-Origin: upstream, http://selenic.com/repo/hg/rev/be6ac2ecc7f8
-Description: test-check-code-hg: skip test if not in a working dir (issue3248)
-Bug-mercurial: http://mercurial.selenic.com/bts/issue3248
-
---- a/tests/test-check-code-hg.t
-+++ b/tests/test-check-code-hg.t
-@@ -1,6 +1,9 @@
-   $ check_code="$TESTDIR"/../contrib/check-code.py
-   $ cd "$TESTDIR"/..
--
-+  $ if ! hg identify -q > /dev/null; then
-+  >     echo "skipped: not a Mercurial working dir" >&2
-+  >     exit 80
-+  > fi
-   $ "$check_code" `hg manifest` || echo 'FAILURE IS NOT AN OPTION!!!'
- 
-   $ "$check_code" --warnings --nolineno --per-file=0 `hg manifest`

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-03-02 23:22:12 UTC (rev 8256)
+++ packages/mercurial/trunk/debian/patches/series	2012-03-02 23:22:44 UTC (rev 8257)
@@ -8,5 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
-from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
 for_upstream__chgrp_test_inherit.patch