Debian has transitioned to python3.sh 2.x which now returns a true string
breaking our tools. See:
https://github.com/amoffat/sh/blob/develop/MIGRATION.md#return-value-now-a-true-string



Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

This message is also required when a maintainer has to summarize
the remaining Apertis changes. Thus, always add this message to
save their time.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

This is deprecated and will be removed in python 3.13.

/usr/bin/apertis-pkg-merge-updates:38: DeprecationWarning: pathlib.Path.__enter__() is deprecated and scheduled for removal in Python 3.13; Path objects as a context manager is a no-op
/usr/bin/apertis-pkg-merge-updates:75: DeprecationWarning: pathlib.Path.__enter__() is deprecated and scheduled for removal in Python 3.13; Path objects as a context manager is a no-op

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Explicitly attempt a fast forward merge before rebasing.

Currently we always try to rebase, which already doews a fast-forward
merge when possible. The issue is that after that we incoditionally try
to append a new changelog entry and if we're fast-forwarding we should
**not** to that since the changelog will already have a version equal or
newer than the one we're trying to add.

By explicitly attempting a fast-forward merge and exiting early we avoid
that issue.

This has not been a particular issue so far since the mirroring
pipeline which uses the rebasing feature does not usually trigger it
when a fast-forward is possible and will create all the branches in
their final state.

However in some cases unrelated errors encountered during the process
have left repositories in a inconsistent state and this change allows to
recover cleanly from those situations.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

These tools are moved from
`infrastructure/apertis-docker-images/package-source-builder`.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>