Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-python/three-merge
Commit message (Collapse)AuthorAgeFilesLines
* dev-python/three-merge: Stabilize 0.1.1-r1 arm64, #918385Arthur Zamarin2023-11-241-1/+1
| | | | Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
* dev-python/three-merge: Keyword 0.1.1-r1 arm64, #918052Arthur Zamarin2023-11-231-1/+1
| | | | Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
* dev-python/three-merge: enable pypy3Andrew Ammerlaan2023-11-171-1/+1
| | | | Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
* dev-python/three-merge: Remove oldMichał Górny2023-07-102-27/+0
| | | | Signed-off-by: Michał Górny <mgorny@gentoo.org>
* dev-python/three-merge: Stabilize 0.1.1-r1 ALLARCHES, #910147Arthur Zamarin2023-07-091-1/+1
| | | | Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
* dev-python/three-merge: Enable py3.12Michał Górny2023-05-312-9/+19
| | | | Signed-off-by: Michał Górny <mgorny@gentoo.org>
* dev-python/three-merge: EAPI=8, PEP517Arthur Zamarin2023-05-271-0/+27
| | | | Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
* */*: remove py3.8 from PYTHON_COMPATDavid Seifert2023-01-141-2/+2
| | | | Signed-off-by: David Seifert <soap@gentoo.org>
* dev-python/three-merge: enable py3.11 and disable py3.7Andrew Ammerlaan2022-05-171-2/+2
| | | | Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
* **/metadata.xml: Replace http by https in DOCTYPE elementUlrich Müller2021-09-111-1/+1
| | | | | Bug: https://bugs.gentoo.org/552720 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* dev-python/three-merge: enable py3.10Andrew Ammerlaan2021-06-051-2/+2
| | | | | Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
* dev-python/three-merge: add <stabilize-allarches/>Andrew Ammerlaan2021-05-221-0/+1
| | | | | Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
* */*: Update my email addressAndrew Ammerlaan2021-05-191-6/+2
| | | | Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
* */*: Add proxied="yes" for non-@gentoo.org peopleMichał Górny2021-03-161-1/+1
| | | | | | | | | | | | Done via: find -name metadata.xml -exec xml ed -P -L \ -a '/pkgmetadata/maintainer[substring(email, string-length(email) - string-length("@gentoo.org") + 1) != "@gentoo.org"]' \ -t attr -n proxied -v yes {} + Signed-off-by: Michał Górny <mgorny@gentoo.org>
* */*: Add 'proxied="proxy"' for proxy-maint projectMichał Górny2021-03-161-1/+1
| | | | | | | | | | Done via: find -name metadata.xml -exec xml ed -P -L \ -a '//maintainer[email="proxy-maint@gentoo.org"]' \ -t attr -n proxied -v proxy {} + Signed-off-by: Michał Górny <mgorny@gentoo.org>
* */*: Normalize metadata.xml filesMichał Górny2021-03-161-1/+1
| | | | | | | | | | | Normalize quoting, replace '>' with entities, replace unnecessary entities, remove trailing empty lines. Done via: find -name metadata.xml -exec xml ed -P -L -d //none {} + Signed-off-by: Michał Górny <mgorny@gentoo.org>
* dev-python/three-merge: x86 stable (bug #760531)Thomas Deutschmann2020-12-201-1/+1
| | | | | Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
* dev-python/three-merge: Stabilize 0.1.1 amd64, #760531Sam James2020-12-191-1/+1
| | | | Signed-off-by: Sam James <sam@gentoo.org>
* dev-python/three-merge: lib to perform 3-way merge between stringsAndrew Ammerlaan2020-11-173-0/+43
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net> Signed-off-by: Joonas Niilola <juippis@gentoo.org>