On Fri, Jun 15, 2018 at 11:57 AM Anthony Fok wrote:
>
> On Fri, Jun 15, 2018 at 7:04 AM, Tong Sun wrote:
>
> > I pushed it up, but didn't find the `debian/sid` branch on
> salsa.debian.org.
> > what I'm missing?
> >
> > $ gbp push --verbose --debian-branch=debian/sid
> > gbp:debug: ['git', 'rev-parse', '--show-cdup']
> > gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
> > gbp:debug: ['git', 'rev-parse', '--git-dir']
> > gbp:debug: ['git', 'symbolic-ref', 'HEAD']
> > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid']
> > gbp:debug: ['git', 'config', 'branch.debian/sid.remote']
> > gbp:debug: ['git', 'tag', '-l', 'debian/0.0_git20151108.ce61ec4-1']
> > gbp:debug: ['git', 'tag', '-l', 'upstream/0.0_git20151108.ce61ec4']
> > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify',
> > 'upstream/0.0_git20151108.ce61ec4^{commit}']
> > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify',
> > 'refs/heads/upstream']
> > gbp:info: Pushing upstream/0.0_git20151108.ce61ec4 to origin
> > gbp:debug: ['git', 'push', 'origin', 'tag',
> > 'upstream/0.0_git20151108.ce61ec4']
> > gbp:info: Pushing refs/heads/upstream to origin:refs/heads/upstream
> > gbp:debug: ['git', 'push', 'origin',
> > 'refs/heads/upstream:refs/heads/upstream']
>
> Answer: There is no debian/sid branch. As of today, dh-make-golang
> names it the "master" rather than "debian/sid", despite what the
> 2017-11 Workflow Changes document at
> https://go-team.pages.debian.net/workflow-changes.html (hidden)
> proposed. There is a wish to "Adopt DEP-14 branch naming", i.e., to
> move from "master" to "debian/sid", and some Debian Go team members
> made that change manually, but most packages are still using the
> "master" branch.
>
> How do you tell?
>
> 1. Run "git branch -a" and see if there is a "debian/sid" branch.
>
> 2. Check debian/gbp.conf, and if it is using "debian/sid" branch, the
> lines
>
> [DEFAULT]
> ...
> debian-branch = debian/sid
>
> [buildpackage]
> dist = DEP14
>
> must be there.
>
Oh, thanks, I followed that 2017-11 Workflow Changes document word for word
and end up with a debian/gbp.conf of one single line:
$ cat debian/gbp.conf
[DEFAULT]
Well, seeing how the "Workflow Changes" document is stagnant, and no
> one has discussed it further on this mailing list for over six months,
> and especially since dh-make-golang has not adopted DEP-14 branch
> naming yet, and there seems to be a promise of automatic migration in
> the future, well, I am not going to change my workflow now, so,
> personally, I am still using whatever dh-make-golang creates for me
> without renaming the default "master" branch or modifying
> debian/gbp.conf.
>
> My personal take on this: 多做多错，少做少错，不做不错。 (Yeah, I am lazy.) The new
> workflow has its benefits and merits, of course, but I like the old
> workflow for its simplicity, and until dh-make-golang is actually
> updated for the new workflow (听其言而观其行), well, I am not budging. But
> that's just me. ;-)
>
> Regardless of your choice of either "master" or "debian/sid", my
> recommendation is to run the following commands:
>
> git push -u --all
> gbp push
>
> And all your branches ("master" or "debian/sid","upstream",
> "pristine-tar") will be pushed properly. No need to push the branches
> one-by-one.
>
> "git push -u --all" needs to be run that one time only. In the
> future, just "gbp push" is sufficient.
>
> "gbp push" does not seem to use --set-upstream-to to set the
> remote-tracking branch properly.
> Maybe I am missing something, but I ended up using "git push -u --all"
> to fix that.
>
Yep, that fixes for me as well:
$ git push -u --all
Counting objects: 15, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (10/10), done.
Writing objects: 100% (15/15), 3.27 KiB | 1.64 MiB/s, done.
Total 15 (delta 1), reused 0 (delta 0)
remote:
remote: To create a merge request for debian/sid, visit:
remote:
https://salsa.debian.org/go-team/packages/golang-github-danverbraganza-varcaser/merge_requests/new?merge_request%5Bsource_branch%5D=debian%2Fsid
remote:
To salsa.debian.org:
go-team/packages/golang-github-danverbraganza-varcaser.git
* [new branch] debian/sid -> debian/sid
Branch 'upstream' set up to track remote branch 'upstream' from 'origin' by
rebasing.
Branch 'debian/sid' set up to track remote branch 'debian/sid' from
'origin' by rebasing.
I'll fix the debian/gbp.conf as per your instruction next.
Having seen you remaining on the master branch instead of changing
to debian/sid, maybe I should do too, to my next package.
But *dropping pristine-tar branches
<https://go-team.pages.debian.net/workflow-changes.html#wf-2017-11-pristine-tar>
*is still a well-accepted suggestion, right?
Sorry I rushed out my email early in the morning without too much thinking
as I don't have much time coating it.
Thanks again for your help.
_______________________________________________
Pkg-go-maintainers mailing list
Pkg-go-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-go-maintainers
