[Python-apps-commits] r8254 - in packages/mercurial/trunk/debian/patches (2 files)

[vicho at users.alioth.debian.org]

    Date: Thursday, March 1, 2012 @ 23:44:37
  Author: vicho
Revision: 8254

Revert "r8241: Ignore the output of chmod in a test so that the testsuite doesn't fail in kfreebsd-*"

It wasn't the output of chmod, it was the value been returned.

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

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch	2012-03-01 23:44:31 UTC (rev 8253)
+++ packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch	2012-03-01 23:44:37 UTC (rev 8254)
@@ -1,17 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: Fix a false positive fail in a test on kfreebsd-*
- test-inherit-mode fails on kfreebsd-* because of differences in the
- output of chmod.  This is not a real failure, so don't flag it as
- such.
-Forwarded: No
---- a/tests/test-inherit-mode.t
-+++ b/tests/test-inherit-mode.t
-@@ -138,7 +138,7 @@
-   $ hg init setgid
-   $ cd setgid
-   $ chmod g+rwx .hg/store
--  $ chmod g+s .hg/store 2> /dev/null
-+  $ chmod g+s .hg/store > /dev/null 2> /dev/null
-   $ mkdir dir
-   $ touch dir/file
-   $ hg ci -qAm 'add dir/file'

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-03-01 23:44:31 UTC (rev 8253)
+++ packages/mercurial/trunk/debian/patches/series	2012-03-01 23:44:37 UTC (rev 8254)
@@ -8,5 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
-for_upstream__test_false_positive_kfreebsd.patch
 from_upstream__test_check_code_hg_skip_test_if_not_wd.patch