diff options
| author | wiz <wiz> | 2015-04-04 11:20:35 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-04-04 11:20:35 +0000 |
| commit | 99f80e5bad33e1805ad7f27aec548c28d9400938 (patch) | |
| tree | e4b5868dd182a07771d3eb5b7c33c5bb103cd1cc /devel/py-mercurial | |
| parent | 7706b8e941518358e2196374e6d165f0d277f5ac (diff) | |
| download | pkgsrc-99f80e5bad33e1805ad7f27aec548c28d9400938.tar.gz | |
Add an upstream patch to fix a test failure.
No change to binary package.
Diffstat (limited to 'devel/py-mercurial')
| -rw-r--r-- | devel/py-mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-mercurial/patches/patch-tests_test-merge-tools.t | 44 |
2 files changed, 46 insertions, 1 deletions
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo index bbdf8c692f2..44bd021dd17 100644 --- a/devel/py-mercurial/distinfo +++ b/devel/py-mercurial/distinfo @@ -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 --git a/devel/py-mercurial/patches/patch-tests_test-merge-tools.t b/devel/py-mercurial/patches/patch-tests_test-merge-tools.t new file mode 100644 index 00000000000..c483a9051d9 --- /dev/null +++ b/devel/py-mercurial/patches/patch-tests_test-merge-tools.t @@ -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> +# 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! |