[pkg-cryptsetup-devel] Repository restructuring incl. branch renaming (Was: cryptsetup_2.3.4-2_source.changes ACCEPTED into unstable)

[Jonas Meurer]

Hey Guilhem :)

Am 16.01.21 um 18:16 schrieb Guilhem Moulin:
> I'd like to highlight this recent change, because that means you might
> need to rename the branches of your local clones too: >
> On Thu, 14 Jan 2021 at 19:03:33 +0000, Debian FTP Masters wrote:
>> cryptsetup (2:2.3.4-2) unstable; urgency=medium
>> […]
>> * Rename Debian resp. upstream branch to debian/latest resp. upstream/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.
> 
> These local steps hopefully cover the change:

Thanks a lot for your thorough explanations regarding the branch 
renames. First, I really appreciate that you renamed the branches, 
second, I even more appreciate your detailed remarks. It's really 
appreciated!

>      $ git branch -m master debian/latest
>      $ git branch -m debian-buster debian/buster
>      $ git branch -m upstream-2.0.x upstream/latest
>      $ git branch {--set-upstream-to=origin/,}debian/latest
>      $ git branch {--set-upstream-to=origin/,}debian/buster
>      $ git branch {--set-upstream-to=origin/,}upstream/latest
>      $ git fetch
>      $ git remote set-head origin debian/latest

I followed these steps and it looks like it worked as expected :)

> Right now upstream/latest and upstream/release-1.7 are respectively
> tracking upstream's master and v1_7_x branches, but with the next
> upstream release I'd like to dissociate them and use git-buildpackage's
> --upstream-vcs-tag option instead to restore upstream/$VERSION tags with
> the upstream tag v$VERSION as an additional parent.  That way we can
> drop our custom merging/verification logic and use gbp/uscan's instead
> (when we started doing that uscan had no tag verification capability).

Sounds reasonable!

Cheers
  jonas


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-cryptsetup-devel/attachments/20210117/77af223b/attachment.sig>