[Debian GNUstep maintainers] Git-fu for fixing #880460

[Yavor Doganov]

Yavor Doganov wrote:
> > I'm not a Git expert

The above should be written underlined, bold, and ALL CAPS :-/

> Actually, here's another idea:

Forget it, it won't work.  The first idea is useless as well.
AFAICS there's no way to do what I want without rewriting history.  I
tested the following:

git branch -c master experimental
git reset --hard debian/0.25.0-4
# Edit debian/rules & commit
# Release 0.25.0-5 and tag it as debian/0.25.0-5
...later...
git checkout experimental
git merge master
# Hack, prepare upload for experimental
git tag debian/0.26.0-1
...later...
git checkout master
git merge experimental
# Hack, prepare upload to unstable

This will preserve at least some part of the history and tags of
debian releases.  The bad thing is that the repository is public so
all users will have to rebase ("all users" == only the two of us, most
probably).

(The last few steps are exactly what I was doing when working on major
new upstream releases that require a transition -- work in a separate
experimental branch so that any RC bugs that appear in sid are fixed
independently in master.)