[Pkg-roundcube-maintainers] Renaming branches and repository restructuring (Was: roundcube_1.4.10+dfsg.2-1_source.changes ACCEPTED into unstable)

[Guilhem Moulin]

Hi folks,

I'd like to highlight these recent changes, because that means you might
rename the branches of your local clones too:

On Fri, 15 Jan 2021 at 23:48:53 +0000, Debian FTP Masters wrote:
> roundcube (1.4.10+dfsg.2-1) unstable; urgency=low
> […]
> * d/watch: Monitor git tags rather than release tarballs.
> * d/gbp.conf: Add upstream VCS tag as additional parent to upstream/$VERSION.
> * d/gbp.conf: Rename upstream branch to upstream/release-1.4.
> […]

On Mon, 28 Dec 2020 at 01:20:19 +0000, Debian FTP Masters wrote:
> roundcube (1.4.10+dfsg.1-1) unstable; urgency=high
> […]
> * Rename Debian branch to debian/latest for DEP-14 compliance.
> […]

AFAICT GitLab doesn't have a way to rename branches so just I pushed new
ones, and deleted the old ones so we don't create diverging branches.

Hopefully these local steps should cover the update:

    $ git branch -m master debian/latest
    $ git branch -m upstream upstream/release-1.4
    $ git branch -m upstream-1.3.x upstream/release-1.3
    $ git remote add upstream https://github.com/roundcube/roundcubemail.git
    $ git config remote.upstream.fetch "+refs/heads/release-*:refs/remotes/upstream/release-*"
    $ git fetch upstream

(I also rename old stale branches such as debian-jessie-backports to
have a consistent namespace.)

-- 
Guilhem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-roundcube-maintainers/attachments/20210116/fb444cb2/attachment.sig>