[pkgsrc/trunk]: pkgsrc/devel/py-mercurial Add an upstream patch to fix a test...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0058075a47c7
branches:  trunk
changeset: 649517:0058075a47c7
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 04 11:20:35 2015 +0000

description:
Add an upstream patch to fix a test failure.
No change to binary package.

diffstat:

 devel/py-mercurial/distinfo                               |   3 +-
 devel/py-mercurial/patches/patch-tests_test-merge-tools.t |  44 +++++++++++++++
 2 files changed, 46 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r d042fdbc4523 -r 0058075a47c7 devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Sat Apr 04 08:00:05 2015 +0000
+++ b/devel/py-mercurial/distinfo       Sat Apr 04 11:20:35 2015 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2015/04/03 10:09:15 wiz Exp $
+$NetBSD: distinfo,v 1.18 2015/04/04 11:20:35 wiz Exp $
 
 SHA1 (mercurial-3.3.3.tar.gz) = 999d5db4961e2c745f17df44d7ae64dce2d8425b
 RMD160 (mercurial-3.3.3.tar.gz) = 7b8a7e5e8c04ac3004e99d0285bdae8f7200aec7
 Size (mercurial-3.3.3.tar.gz) = 4167447 bytes
+SHA1 (patch-tests_test-merge-tools.t) = 1a62d4344eee51b27f7a9f34fe7ebff939371542
diff -r d042fdbc4523 -r 0058075a47c7 devel/py-mercurial/patches/patch-tests_test-merge-tools.t
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-mercurial/patches/patch-tests_test-merge-tools.t Sat Apr 04 11:20:35 2015 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-tests_test-merge-tools.t,v 1.1 2015/04/04 11:20:35 wiz Exp $
+
+# HG changeset patch
+# User Martin von Zweigbergk <martinvonz%google.com@localhost>
+# Date 1423613835 28800
+#      Tue Feb 10 16:17:15 2015 -0800
+# Node ID 9d0b6ef92eb212bf4945822139dac996c4e1322c
+# Parent  a450e0a2ba0ae28f84125cc6d9ada7790e2a2816
+test-merge-tools: fix flaky test by avoiding debugsetparents
+
+debugsetparents is a debug command and does not provide the same
+guarantees as non-debug commands do. In particular, when the user sets
+a different parent, any clean files will remain clean in the dirstate
+even though the new parent might have a different version of the file
+(so it should appear modified compared to the new parent). Let's
+instead achieve the same effect by updating to the new parent and
+reverting the contents back to what they were.
+
+This fix can be tested by passing '--config
+debug.dirstate.delaywrite=2' to the 'hg update' command in the
+beforemerge().
+
+--- tests/test-merge-tools.t.orig      2015-04-01 18:27:41.000000000 +0000
++++ tests/test-merge-tools.t
+@@ -603,7 +603,8 @@ update is a merge ...
+   true.priority=1
+   true.executable=cat
+   # hg update -C 1
+-  $ hg debugsetparent 0
++  $ hg update -q 0
++  $ hg revert -q -r 1 .
+   $ hg update -r 2
+   merging f
+   revision 1
+@@ -628,7 +629,8 @@ update should also have --tool
+   true.priority=1
+   true.executable=cat
+   # hg update -C 1
+-  $ hg debugsetparent 0
++  $ hg update -q 0
++  $ hg revert -q -r 1 .
+   $ hg update -r 2 --tool false
+   merging f
+   merging f failed!