[Python-apps-commits] r8268 - in packages/mercurial/trunk/debian/patches (1 file)

[vicho at users.alioth.debian.org]

    Date: Wednesday, March 7, 2012 @ 23:29:58
  Author: vicho
Revision: 8268

Modify for_upstream__fix_kfreebsd_test_inherit.patch to match what was accepted upstream

While we are at it, add the URL of the actual accepted changeset
upstream.

Modified:
  packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch

Modified: packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch	2012-03-04 22:20:18 UTC (rev 8267)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch	2012-03-07 23:29:58 UTC (rev 8268)
@@ -5,7 +5,7 @@
  test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store"
  fails to set the SGID bit and returns 1.  If we ignore chmod's return
  code, the testsuite passes again.
-Forwarded: http://selenic.com/pipermail/mercurial-devel/2012-March/038464.html
+Origin: upstream, http://selenic.com/hg/rev/7cf8de5a82d8
 
 --- a/tests/test-inherit-mode.t
 +++ b/tests/test-inherit-mode.t
@@ -14,7 +14,7 @@
    $ cd setgid
    $ chmod g+rwx .hg/store
 -  $ chmod g+s .hg/store 2> /dev/null
-+  $ chmod g+s .hg/store 2> /dev/null || /bin/true
++  $ chmod g+s .hg/store 2> /dev/null || true
    $ mkdir dir
    $ touch dir/file
    $ hg ci -qAm 'add dir/file'