Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #16192

Re: Moving default branch after project creation

Show key headers only | View raw

Am 08.08.24 um 07:54 schrieb Julian Gilbey:
> The OP specifically said they got it from DEP-14.  Thanks also to
> Nicholas for reminding me of the DEP-14 history!

I don't see what makes the difference in the end?

There is a DPT policy that enforces to usage of the branch name 
debian/master for working on versions intended for unstable/sid.

Alexandru has permissions of the group Developer according to the 
members list overview. It might be that this membership is restricted to 
not being able to change the default branch. I haven't looked deeper 
into this.

The current structure of the tree is wrong to me or at least contains a 
useless branch.

> $ git logg
> * commit 4c0b559c9f60321be2fa412d73555ab38c517f16 (origin/pristine-tar)
>   Author: Alexandru Mihail <alexandru.mihail2897@gmail.com>
>   Date:   Wed Aug 7 19:11:03 2024 +0300
>   
>       pristine-tar data for psrecord_1.4.orig.tar.gz
>   
> * commit 1443d1a19aeed367f2f2131757f01e2b9eafcfb4 (tag: upstream/1.4, origin/upstream, origin/debian/master)
> | Author: Alexandru Mihail <alexandru.mihail2897@gmail.com>
> | Date:   Wed Aug 7 18:46:41 2024 +0300
> | 
> |     New upstream version 1.4
> | 
> * commit 4c41bddf5c750a5c694aaba42c8252b444856ff7 (HEAD -> main, origin/main, origin/HEAD)
>   Author: Alexandru Mihail <alexandru.mihail2897@gmail.com>
>   Date:   Wed Aug 7 15:21:38 2024 +0000
>   
>       Initial commit

There is the branch 'main' which contains just one file 'Readme.md'.

That one single commit is the parent for the two branches 'upstream' and 
'debian/master' which includes the upstream source I guess as there is 
also the tag upstream/1.4.

@Alexandru
For starting a packaging the git tree on Salsa is quite the last thing 
you need to deal with (except you need a repo quite early in case of 
needed and wanted collaboration with others).

I guess you did something like this at the start, if not you could do it 
this way.

$ # get the upstream tarball e.g. into ~/Downloads
$ mkdir python-psrecord
$ cd python-psrecord
$ $ git init
$ $ gbp import-orig --verbose --sign-tags --pristine-tar 
--upstream-branch=upstream --debian-branch=debian/master 
~/Downloads/psrecord-1.4.tar.gz
$ git branch -a
* debian/master
   pristine-tar
   upstream
$ git logg
* commit 6dc6446feb741badb628632a20a8fd64be3dd98e (HEAD -> 
debian/master, tag: upstream/1.4, upstream)
   Author: Carsten Schoenert <c.schoenert@t-online.de>
   Date:   Thu Aug 8 08:17:32 2024 +0200

       New upstream version 1.4

* commit a309926d28d52527e88e3c96c7d2ec2c4b74347d (pristine-tar)
   Author: Carsten Schoenert <c.schoenert@t-online.de>
   Date:   Thu Aug 8 08:17:32 2024 +0200

       pristine-tar data for psrecord_1.4.orig.tar.gz

Or you create the folder debian/ and here a file gbp.conf with this 
minimal content:

[DEFAULT]
pristine-tar = True
compression = gz
debian-branch = debian/master
upstream-branch = upstream

and use than for importing this command

$ gbp import-orig --verbose --sign-tags ~/Downloads/psrecord-1.4.tar.gz


If you are not that familiar with the GitLab/Salsa UI I strongly suggest 
you start the packaging in your own namespace and ask for reviewing, the 
git tree can later be easily moved into the DPT namespace!
In your name space you can do e.g. force pushing, branch and tag 
deleting that are not allowed normally if you use the official DPT 
namespace.

For now I suggest to delete all content in 
https://salsa.debian.org/python-team/packages/psrecord so an empty 
repository is left.

Also add please some more information into the field of the project 
description e.g. what the upstream url of the project is.

If you not able to delete the now existing stuff please raise your 
hands. The repo could also moved into your namespace so you would have 
full access rights.

BTW: Within the ITP #1075810 you stated you want to maintain this 
package on your own, did you changed your minds?

And please use python-psrecord as source package name, psrecord is quite 
generic. A name python-psrecord would show it is a Python related package.

-- 
Regards
Carsten

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: Moving default branch after project creation Julian Gilbey <julian@d-and-j.net> - 2024-08-07 22:40 +0200
  Re: Moving default branch after project creation Nicholas D Steeves <sten@debian.org> - 2024-08-08 01:00 +0200
  Re: Moving default branch after project creation Carsten Schoenert <c.schoenert@t-online.de> - 2024-08-08 06:00 +0200
    Re: Moving default branch after project creation Julian Gilbey <julian@d-and-j.net> - 2024-08-08 08:00 +0200
      Re: Moving default branch after project creation Carsten Schoenert <c.schoenert@t-online.de> - 2024-08-08 09:00 +0200
        Re: Moving default branch after project creation Martin <debacle@debian.org> - 2024-08-08 09:50 +0200
          Re: Moving default branch after project creation Carsten Schoenert <c.schoenert@t-online.de> - 2024-08-08 13:10 +0200
      Re: Moving default branch after project creation Carsten Schoenert <c.schoenert@t-online.de> - 2024-08-12 08:20 +0200
        Re: Moving default branch after project creation Alexandru Mihail <alexandru.mihail2897@gmail.com> - 2024-08-12 09:40 +0200

csiph-web