comparison 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
comparison
equal deleted inserted replaced
32267:c2380b448265 32268:24f55686a63d
304 added 2 changesets with 2 changes to 1 files 304 added 2 changesets with 2 changes to 1 files
305 bundle2-input-part: total payload size 1686 305 bundle2-input-part: total payload size 1686
306 bundle2-input-bundle: 0 parts total 306 bundle2-input-bundle: 0 parts total
307 updating the branch cache 307 updating the branch cache
308 invalid branchheads cache (served): tip differs 308 invalid branchheads cache (served): tip differs
309 history modification detected - truncating revision branch cache to revision 9
310 rebase completed 309 rebase completed
311 truncating cache/rbc-revs-v1 to 72
312 310
313 Test minimization of merge conflicts 311 Test minimization of merge conflicts
314 $ hg up -q null 312 $ hg up -q null
315 $ echo a > a 313 $ echo a > a
316 $ hg add a 314 $ hg add a