On 10/18/2016 01:33 AM, Mads Kiilerich wrote:
# HG changeset patch
# User Mads Kiilerich <mad...@unity3d.com>
# Date 1476746894 -7200
#      Tue Oct 18 01:28:14 2016 +0200
# Branch stable
# Node ID 548f82b480d086c7a551b025fb980cd70187c880
# Parent  328545c7d8a1044330b8a5bfbdd9c2ff08625d6a
tests: work around instability that caused test from 4999c12c526b to fail

I'm not too sure of what is going on here, Can you elaborate?
It is also not clear to me that the test is still valid once we replace "c" with "C". --check is quite strict and I'm not sure why someone would have put it there randomly.

(note: this is targeted for stable so it can probably be taken after the freeze is in effect)

diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -732,12 +732,16 @@ bit correctly on the platform being unaw

 #endif

+FIXME: At this point large2 seems to be fishy and cause up -c to fail
+"randomly" even though summary shows no changes. For now, just work around it:
+  $ rm large2 .hglf/large2
+
 Test a fatal error interrupting an update. Verify that status report dirty
 files correctly after an interrupted update. Also verify that checking all
 hashes reveals it isn't clean.

 Start with clean dirstates:
-  $ hg up -qcr "8^"
+  $ hg up -qCr "8^"
   $ sleep 1
   $ hg st
 Update standins without updating largefiles - large1 is modified and largeX is

--
Pierre-Yves David
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to