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

[Satoru KURASHIKI]

hi,

On Wed, Dec 2, 2020 at 7:16 PM Dominic Hargreaves <dom at earth.li> wrote:
> 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.

I agree with you, it's a good timing to change branch structure to fit
standard debian way.
So, I've reworked on my local repository to reflect them.

https://salsa.debian.org/lurdan-guest/rt-extension-customfieldsonupdate/-/network/new-upstream

Branches are:
proposed-branch-fix: debian branch, will be renamed to master.
new-upstream: upstream branch, will be renamed to upstream.
pristine-tar: as is

If there's no problem, I'll try to force push them to team repository.

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

Sure, and got it, thanks :-)

In addition to things above, I want to include changes below for next upload:
- add "(Closes: #835816)" to changelog entry about debhelper.
- remove Uploders: entry from debian control (due to my low activity).

regards,

--
KURASHIKI Satoru