Mercurial > hg
view mercurial/cacheutil.py @ 42151:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 14 Apr 2019 13:46:40 -0700 |
parents | 72fdd99eb526 |
children | 57875cf423c9 |
line wrap: on
line source
# scmutil.py - Mercurial core utility functions # # Copyright Matt Mackall <mpm@selenic.com> and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from . import repoview def cachetocopy(srcrepo): """return the list of cache file valuable to copy during a clone""" # In local clones we're copying all nodes, not just served # ones. Therefore copy all branch caches over. cachefiles = ['branch2'] cachefiles += ['branch2-%s' % f for f in repoview.filtertable] cachefiles += ['rbc-names-v1', 'rbc-revs-v1'] cachefiles += ['tags2'] cachefiles += ['tags2-%s' % f for f in repoview.filtertable] cachefiles += ['hgtagsfnodes1'] return cachefiles