[Debian-iot-maintainers] Repairing DEP-14 for the mosquitto repo

[Joachim Zobel]

Hi.

Commit 508273a5 deleted files from upstream. Unfortunately there is no
documentation on why they were removed. So I assume this was done
because the committer considered them unnecessary. 

Since upstream still maintains the removed files this caused and will
cause modify/delete conflicts. This situation is quite hard to resolve.
So usage of the master branch was temporarily abandoned by releases for
2.0.17 and 2.0.18. This should be repaired, the alternative is to give
up DEP-14. 

To resolve this I want to do what I suggest below:
My plan is to rename the existing branches master and debian/master by
postfixing with .outdated. This is done to avoid changing the history
of published packages. They are then replaced with branches that start
at the commit before 508273a5. On a fresh local repository clone this
is:

git remote add upstream https://github.com/eclipse/mosquitto.git
git co --track origin/master
git branch -m master master.outdated
git branch master b0277869
git co master
git pull -t upstream master
git branch -m debian/master debian/master.outdated
git branch debian/master 14f43638
git co debian/master
git merge v2.0.19
git merge debian/master.outdated

Note that his also prepares the 2.0.19 release.

Bringing the above into the Salsa repository can hopefully done using
the salsa command line which has rename_branch. Otherwise I'll have to
rename the existing branches by renamed pushing and deletion.

Please state any objections ASAP since I want to do this before the
2.0.19 release.

Sincerely,
Joachim