[request-tracker-maintainers] How to fix salsa repository history? (rt-extension-customfieldsonupdate)

[Dominic Hargreaves]

On Wed, Dec 02, 2020 at 06:24:50PM +0900, Satoru KURASHIKI wrote:
> hi,
> 
> On Tue, Dec 1, 2020 at 10:52 AM Satoru KURASHIKI <lurdan at gmail.com> wrote:
> > Basically, I think of replacing three commits:
> > 85494d1823bde2dbc48d9734b63d082ddf0bafa9
> > a8d19f786416425ef0922d12a17c6fb0188cbee1
> > eb0a931a508e2cdb4c5d41bd1a13f320b9514b23
> > with something which gbp import-dsc 1.02-1 diff, and will fix conflicts.
> > # And I know its bad manner...
> 
> I've created local branch to illustrate what I intend:
> https://salsa.debian.org/lurdan-guest/rt-extension-customfieldsonupdate/-/network/proposed-branch-fix

Hi,

Thanks for your attention to this. The root of the problem here
is that the debian branch is based directly from the upstream
git, but we need to use the upstream tarballs as our base.

I think your fix is okay, but in future we should maintain and
upstream and master branch in the standard way, using git import-orig
rather than tracking upstream git directly (since the tarballs and
git don't match). So as you're going to need to force push anyway,
would you be able to rename the branchess and run git import-orig with
1.02 to get the upstream one in shape? Ideally you'd then merge that
into the new master branch before reapplying Andrew's subsequent changes.

As Andrew is actively working on this please wait for an ack from
him too before force pushing.

Best
Dominic