diff options
| author | Matt Housh <jaeger@crux.ninja> | 2020-08-12 15:29:11 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.ninja> | 2020-08-12 15:29:11 -0500 |
| commit | 3233c72fa4b30b2943e5be986c7937a7cd8f7657 (patch) | |
| tree | bf166d49b637691277023f475f9601fdba26f57c /mercurial | |
| parent | c8c52813707e7b62818807653a4cc29a8deb8f5b (diff) | |
| parent | 8a04092fd25f7db105df72d5e522fd8bcd96a042 (diff) | |
| download | contrib-3233c72fa4b30b2943e5be986c7937a7cd8f7657.tar.gz contrib-3233c72fa4b30b2943e5be986c7937a7cd8f7657.tar.xz | |
Merge branch '3.5' into 3.6
Diffstat (limited to 'mercurial')
| -rw-r--r-- | mercurial/.footprint | 7 | ||||
| -rw-r--r-- | mercurial/.signature | 8 | ||||
| -rw-r--r-- | mercurial/Pkgfile | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/mercurial/.footprint b/mercurial/.footprint index e99c1dd17..c87265d7d 100644 --- a/mercurial/.footprint +++ b/mercurial/.footprint @@ -345,7 +345,7 @@ drwxr-xr-x root/root usr/lib/python3.8/site-packages/hgext3rd/ -rw-r--r-- root/root usr/lib/python3.8/site-packages/hgext3rd/__init__.py drwxr-xr-x root/root usr/lib/python3.8/site-packages/hgext3rd/__pycache__/ -rw-r--r-- root/root usr/lib/python3.8/site-packages/hgext3rd/__pycache__/__init__.cpython-38.pyc --rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial-5.4.2-py3.8.egg-info +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial-5.5-py3.8.egg-info drwxr-xr-x root/root usr/lib/python3.8/site-packages/mercurial/ -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__init__.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__modulepolicy__.py @@ -416,7 +416,9 @@ drwxr-xr-x root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/ -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/match.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/mdiff.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/merge.cpython-38.pyc +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/mergestate.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/mergeutil.cpython-38.pyc +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/metadata.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/minifileset.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/minirst.cpython-38.pyc -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/__pycache__/namespaces.cpython-38.pyc @@ -594,6 +596,7 @@ drwxr-xr-x root/root usr/lib/python3.8/site-packages/mercurial/helptext/internal -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/__init__.py (EMPTY) drwxr-xr-x root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/__pycache__/ -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/__pycache__/__init__.cpython-38.pyc +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/bid-merge.txt -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/bundle2.txt -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/bundles.txt -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/helptext/internals/cbor.txt @@ -668,7 +671,9 @@ drwxr-xr-x root/root usr/lib/python3.8/site-packages/mercurial/interfaces/__pyca -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/match.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/mdiff.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/merge.py +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/mergestate.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/mergeutil.py +-rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/metadata.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/minifileset.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/minirst.py -rw-r--r-- root/root usr/lib/python3.8/site-packages/mercurial/namespaces.py diff --git a/mercurial/.signature b/mercurial/.signature index 547b8af67..dfc5270e9 100644 --- a/mercurial/.signature +++ b/mercurial/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wmoLcXdsqYhmrfQGdsYNs4IZlJCGtcXk4DcYmCcuSkhtY/24yDLYazMhG//LrPETetYPd5aig8RzO3GA4w2eQ8= -SHA256 (Pkgfile) = 3c09c0411378a90e9ee108e3afd204fc14cd95d1b7dfd7b8a5ecb1e01917de54 -SHA256 (.footprint) = 75507b240cb477be2ed1ff7f00f87769dea024b05e20f5114e609a611eea0841 -SHA256 (mercurial-5.4.2.tar.gz) = 5c8b93da701ee39e312da9e35a7f3163e17ed173a4707857bc467c3b3ab74853 +RWSagIOpLGJF3wEz0c+3R5ychfZ9XTBSA+Z85pqVdF+ET6uEEqPiK7xkiQvDvMeqDfL0jvvzN6zyvhEUhQDAuExbyJrJZFHeMg8= +SHA256 (Pkgfile) = dcec4fcf4ef0345cd1c726244f57f32e52560ed9a1674d81140d39ade74b08d7 +SHA256 (.footprint) = 27a06e40f6c9ea64c6ca45347d7623d333650f2c04964f6258befec3efbc1a19 +SHA256 (mercurial-5.5.tar.gz) = c1ed28e1534304a7a4981ed59905286d1c56acd5b75755eedd184171a4a782b4 diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile index c617d4420..de4d1a99b 100644 --- a/mercurial/Pkgfile +++ b/mercurial/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3 name=mercurial -version=5.4.2 +version=5.5 release=1 source=(https://www.mercurial-scm.org/release/mercurial-$version.tar.gz) |