preserve-mps-on-reimport : lp:~racb/git-ubuntu : Git : Code : git-ubuntu

Get this branch:: git clone -b preserve-mps-on-reimport https://git.launchpad.net/~racb/git-ubuntu

Only Robie Basak can upload to this branch. If you are Robie Basak please log in for upload directions.

Branch merges

Merged into git-ubuntu:master at revision 7a60e7f1373a7480a507ac7e0e7da8b53ca968c0

Bryce Harrington: Approve on 2020-05-02

Server Team CI bot: Approve (continuous-integration) on 2020-05-01

Branch information

Name:: preserve-mps-on-reimport

Repository:: lp:~racb/git-ubuntu

Recent commits

7a60e7f... by Robie Basak on 2020-04-24

Preserve MPs on reimport

When reimporting, instead of deleting a git repository before repushing
it, we can force push all our new refs and ensure that refs not being
pushed get deleted using --prune. This creates the same effect but
allows us to preserve old merge proposals.

There is a possibility that some configuration in the git repository
will be left behind from a previous import. However all configuration
(eg. the HEAD pointer) is reset by the importer on every run, so
everything that the importer touches will get fixed. Anything else can
be considered out of scope for --reimport to achieve.

The default repository for the source package will therefore not be
reset; if it was set to the old repository, it will continue to point to
the "new" one. This is actually what we want, so is fine.

13ad773... by Robie Basak on 2020-05-01