Mercurial > hg
comparison hgext/sparse.py @ 47914:8e46934c58d2
dirstate: drop the deprecated `merge` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11349
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:11:57 +0200 |
parents | 3911c61f09c6 |
children | a6efb9180764 |
comparison
equal
deleted
inserted
replaced
47913:3911c61f09c6 | 47914:8e46934c58d2 |
---|---|
256 # Prevent adding files that are outside the sparse checkout | 256 # Prevent adding files that are outside the sparse checkout |
257 editfuncs = [ | 257 editfuncs = [ |
258 b'set_tracked', | 258 b'set_tracked', |
259 b'set_untracked', | 259 b'set_untracked', |
260 b'copy', | 260 b'copy', |
261 b'merge', | |
262 ] | 261 ] |
263 hint = _( | 262 hint = _( |
264 b'include file with `hg debugsparse --include <pattern>` or use ' | 263 b'include file with `hg debugsparse --include <pattern>` or use ' |
265 + b'`hg add -s <file>` to include file directory while adding' | 264 + b'`hg add -s <file>` to include file directory while adding' |
266 ) | 265 ) |