Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 48725:9bc86adf32f6
merge-actions: make merge action a full featured object
This open the way for having "smarter" value as action, making the usage code
simpler and more flexible.
We have to explicitly use __bytes__ call in a couple of place because Python2?
Differential Revision: https://phab.mercurial-scm.org/D12114
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Jan 2022 17:08:30 +0100 |
| parents | d536d4afe003 |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Fri Jan 28 16:25:41 2022 +0100 +++ b/hgext/largefiles/overrides.py Fri Jan 28 17:08:30 2022 +0100 @@ -61,7 +61,7 @@ lfstatus = lfutil.lfstatus -MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr' +MERGE_ACTION_LARGEFILE_MARK_REMOVED = mergestatemod.MergeAction('lfmr') # -- Utility functions: commonly/repeatedly needed functionality ---------------