diff tests/test-rebase-conflicts.t @ 32268:24f55686a63d

caches: stop warming the cache after changegroup application Now that we garantee that branchmap cache is updated at the end of the transaction we can drop this update. This removes a problematic case with nested transaction where the new cache could be written on disk before the transaction is finished (and even roll-backed) Such premature cache write was visible in the following test: * tests/test-acl.t * tests/test-rebase-conflicts.t In addition, running the cache update later means having more date about the state of the repository (in particular: phases). So we can generate caches with more information. This creates harmless changes to the following tests: * tests/test-hardlinks-whitelisted.t * tests/test-hardlinks.t * tests/test-phases.t * tests/test-tags.t * tests/test-inherit-mode.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 02 May 2017 18:57:52 +0200
parents c2380b448265
children 8e3021fd1a44
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Tue May 02 22:27:44 2017 +0200
+++ b/tests/test-rebase-conflicts.t	Tue May 02 18:57:52 2017 +0200
@@ -306,9 +306,7 @@
   bundle2-input-bundle: 0 parts total
   updating the branch cache
   invalid branchheads cache (served): tip differs
-  history modification detected - truncating revision branch cache to revision 9
   rebase completed
-  truncating cache/rbc-revs-v1 to 72
 
 Test minimization of merge conflicts
   $ hg up -q null