Re: Update URL to dtache.el package

[Stefan Monnier]

Niklas Eklund [2022-04-27 16:35:00] wrote:
> I have moved the development of dtache.el, which can be found in ELPA,
> from gitlab to sourcehut. For reference see this commit:
> https://gitlab.com/niklaseklund/dtache/-/commit/b762fe472f1a47d0f1808620d4468aee645654ee
> Here is a patch that updates the URL to the new location.

Thanks.  Now we have a problem because the two have diverged:

    % make fetch/dtache
    emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "dtache"
    Fetching updates for dtache...
    Upstream of dtache has DIVERGED!
    
      Local changes:
    Depuis https://git.sr.ht/~niklaseklund/dtache
     * [nouvelle référence]               -> upstream/dtache/main
    b762fe472f  niklas.eklund@..  Announce development migration
    
      Upstream changes:
    bef9614c76  niklas.eklund@..  Update README with build badge
    7fe012d48e  niklas.eklund@..  Address redraw in tests
    35f8f636a7  niklas.eklund@..  Add .build.yml file
    6b595f4946  niklas.eklund@..  Add markdown README
    
    % 

Could you `git merge b762fe472f` (*not* rebase) into the SourceHut
branch, so that `elpa.git` can continue tracking that new branch?


        Stefan