Mercurial > hg
view tests/testlib/ext-sidedata-4.py @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | ba8e508a8e69 |
children | 6000f5b25c9b |
line wrap: on
line source
# coding: utf8 # ext-sidedata-4.py - small extension to test (differently still) the sidedata # logic # # Simulates a server for a complex sidedata exchange. # # Copyright 2021 Raphaël Gomès <rgomes@octobus.net> # # 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 mercurial.revlogutils import sidedata def reposetup(ui, repo): repo.register_wanted_sidedata(sidedata.SD_TEST2) repo.register_wanted_sidedata(sidedata.SD_TEST3)